diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-30 11:06:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-01 06:57:19 +0000 |
| commit | e209d115d41e25f5658dd52ae94ceb873b33013f (patch) | |
| tree | 58b49bdcc833ec48bc8542f81b7918f50e07bb6d | |
| parent | 8e27c68847c6461c7bc0bdbff44412d6bfb0b1e8 (diff) | |
remove old standalone Sun bug numbers
Sun bug numbers without any accompanying text are completely useless.
Fixed with
git grep -lP '//\s*#\d+#\s*$'
| xargs perl -i -ne'/\/\/\s*#\d+#\s*$/d or print'
And then hand-checking the result to restore places where it deleted code.
And then some more grepping and hand-editing to kill the others.
Change-Id: Ia96ce4466db8bb8da363ebf41f0ae7f45f28bf29
Reviewed-on: https://gerrit.libreoffice.org/19023
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
179 files changed, 49 insertions, 370 deletions
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 9e4ab9b5c00f..4304ab3f86af 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -620,7 +620,6 @@ void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) throw (Ru // reorder objects in drawing page GetModel()->GetPage(0)->SetObjectOrdNum( nOldTabIndex + 1, nNewTabIndex + 1 ); - // #110559# pForm->UpdateTabOrderAndGroups(); } @@ -897,7 +896,6 @@ void DlgEdObj::clonedFrom(const DlgEdObj* _pSource) aCtrl <<= xCtrl; xCont->insertByName( aOUniqueName , aCtrl ); - // #110559# pDlgEdForm->UpdateTabOrderAndGroups(); } } @@ -1043,7 +1041,6 @@ void DlgEdObj::SetDefaults() &GetDialogEditor(), aAny, aOUniqueName ); - // #110559# pDlgEdForm->UpdateTabOrderAndGroups(); } } @@ -1478,7 +1475,6 @@ void DlgEdForm::UpdateTabIndices() } } - // #110559# UpdateTabOrderAndGroups(); } @@ -1491,7 +1487,6 @@ void DlgEdForm::UpdateTabIndices() void DlgEdForm::UpdateTabOrder() { - // #110559# // When the tabindex of a control model changes, the dialog control is // notified about those changes. Due to #109067# (bad performance of // dialog editor) the dialog control doesn't activate the tab order @@ -1511,7 +1506,6 @@ void DlgEdForm::UpdateTabOrder() void DlgEdForm::UpdateGroups() { - // #110559# // The grouping of radio buttons in a dialog is done by vcl. // In the dialog editor we have two views (=controls) for one // radio button model. One control is owned by the dialog control, diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx index cacb081371e7..d3825459484c 100644 --- a/basctl/source/dlged/dlgedview.cxx +++ b/basctl/source/dlged/dlgedview.cxx @@ -37,7 +37,6 @@ DlgEdView::DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor) SdrView(&rModel, &rOut), rDlgEditor(rEditor) { - // #114898# SetBufferedOutputAllowed(true); SetBufferedOverlayAllowed(true); } diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 516390dcc356..828e09b8d331 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -207,7 +207,6 @@ namespace comphelper case AccessibleEventId::TABLE_ROW_DESCRIPTION_CHANGED: case AccessibleEventId::TABLE_ROW_HEADER_CHANGED: case AccessibleEventId::TABLE_SUMMARY_CHANGED: - // #130798# // these Ids are also missed: SUB_WINDOW_OF_RELATION_CHANGED & TEXT_ATTRIBUTE_CHANGED case AccessibleEventId::TEXT_SELECTION_CHANGED: // nothing to translate diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 3f8a73256211..094f05e41e61 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -129,7 +129,7 @@ void SvxHyperlinkInternetTp::FillDlgFields(const OUString& rStrURL) if ( aURL.GetProtocol() != INetProtocol::NotValid ) m_pCbbTarget->SetText( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ); else - m_pCbbTarget->SetText(rStrURL); // #77696# + m_pCbbTarget->SetText(rStrURL); SetScheme(aStrScheme); } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 8d94eae2d59c..966947a98bff 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -422,7 +422,6 @@ OUString SvxHyperlinkTabPageBase::GetSchemeFromURL( const OUString& rStrURL ) INetURLObject aURL( rStrURL ); INetProtocol aProtocol = aURL.GetProtocol(); - // #77696# // our new INetUrlObject now has the ability // to detect if an Url is valid or not :-( if ( aProtocol == INetProtocol::NotValid ) diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 56db07bc19bc..d9126586d850 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -110,7 +110,6 @@ private: VclPtr<CheckBox> m_pCbxSynchronize; VclPtr<SvxXLinePreview> m_pCtlPreview; - // #116827# VclPtr<VclFrame> m_pFLEdgeStyle; VclPtr<VclGrid> m_pGridEdgeCaps; VclPtr<ListBox> m_pLBEdgeStyle; @@ -169,7 +168,6 @@ private: SfxMapUnit m_ePoolUnit; - // #63083# sal_Int32 m_nActLineWidth; // handler for gallery popup menu button + size @@ -186,7 +184,6 @@ private: DECL_LINK( ChangePreviewHdl_Impl, void * ); DECL_LINK( ChangeTransparentHdl_Impl, void * ); - // #116827# DECL_LINK( ChangeEdgeStyleHdl_Impl, void * ); // LineCaps diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 5c17f39066c2..3033918c8751 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -552,7 +552,6 @@ IMPL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl, -//#98647#---------------------------------------------- void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt ) { // try to show tips just like as on toolbars sal_Int32 nPos=LISTBOX_ENTRY_NOTFOUND; diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 9988726f86a6..d085a99e0896 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -272,7 +272,6 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet) SvxSizeItem aSz( nW ); // size could already have been set from another page - // #44204# const SfxItemSet* pExSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; const SfxPoolItem* pItem = 0; if( pExSet && SfxItemState::SET == diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 3877183e4921..14abb1d56f60 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -357,7 +357,6 @@ IMPL_LINK_NOARG_TYPED(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, voi else aFmt.SetSuffix(_pSet->sSuffix); aFmt.SetCharFormatName(sNumCharFmtName); - // #62069# // #92724# aFmt.SetBulletRelSize(100); pActNum->SetLevel(i, aFmt); } @@ -513,7 +512,6 @@ IMPL_LINK_NOARG_TYPED(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, void) aFmt.SetBulletFont(&rActBulletFont); aFmt.SetBulletChar(cChar ); aFmt.SetCharFormatName(sBulletCharFormatName); - // #62069# // #92724# aFmt.SetBulletRelSize(45); pActNum->SetLevel(i, aFmt); } @@ -763,14 +761,12 @@ IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) ? pLevelSettings->sBulletChar[0] : 0 ); aFmt.SetCharFormatName( sBulletCharFormatName ); - // #62069# // #92724# aFmt.SetBulletRelSize(45); } else { aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? pActNum->GetLevelCount() : 0)); aFmt.SetCharFormatName(sNumCharFmtName); - // #62069# // #92724# aFmt.SetBulletRelSize(100); // #i93908# aFmt.SetPrefix(pLevelSettings->sPrefix); diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index b604038fa78e..3d0e20cf2ce3 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -314,7 +314,6 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) bool bGradActive = (eStateGradient == SfxItemState::SET && static_cast<const XFillFloatTransparenceItem*>(pGradientItem)->IsEnabled()); bool bLinearActive = (eStateLinear == SfxItemState::SET && static_cast<const XFillTransparenceItem*>(pLinearItem)->GetValue() != 0); - // #103765# bool bGradUsed = (eStateGradient == SfxItemState::DONTCARE); bool bLinearUsed = (eStateLinear == SfxItemState::DONTCARE); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index e044eb34c49e..5c2227d13cbb 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -196,7 +196,6 @@ SvxLineTabPage::SvxLineTabPage m_pTsbCenterStart->SetClickHdl( LINK( this, SvxLineTabPage, ChangeStartClickHdl_Impl ) ); m_pTsbCenterEnd->SetClickHdl( LINK( this, SvxLineTabPage, ChangeEndClickHdl_Impl ) ); - // #116827# Link<> aEdgeStyle = LINK( this, SvxLineTabPage, ChangeEdgeStyleHdl_Impl ); m_pLBEdgeStyle->SetSelectHdl( aEdgeStyle ); @@ -682,7 +681,6 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) m_nDlgType == 1101 ) { m_pFlLineEnds->Hide(); - // #116827# m_pFLEdgeStyle->Hide(); } } @@ -874,7 +872,6 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) } } - // #116827# nPos = m_pLBEdgeStyle->GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND != nPos && m_pLBEdgeStyle->IsValueChangedFromSaved() ) { @@ -1038,7 +1035,6 @@ bool SvxLineTabPage::FillXLSet_Impl() m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ) ); } - // #116827# nPos = m_pLBEdgeStyle->GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) { @@ -1112,7 +1108,6 @@ bool SvxLineTabPage::FillXLSet_Impl() sal_uInt16 nVal = (sal_uInt16)m_pMtrTransparent->GetValue(); m_rXLSet.Put( XLineTransparenceItem( nVal ) ); - // #116827# m_pCtlPreview->SetLineAttributes(m_aXLineAttr.GetItemSet()); return true; @@ -1452,7 +1447,6 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) OUString aStr = GetUserData(); m_pCbxSynchronize->Check( aStr.toInt32() != 0 ); - // #116827# if(m_bObjSelected && SfxItemState::DEFAULT == rAttrs->GetItemState(XATTR_LINEJOINT)) { // maFTEdgeStyle.Disable(); @@ -1511,7 +1505,6 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) m_pTsbCenterEnd->SaveValue(); m_pMtrTransparent->SaveValue(); - // #116827# m_pLBEdgeStyle->SaveValue(); // LineCaps @@ -1617,7 +1610,6 @@ IMPL_LINK( SvxLineTabPage, ChangeStartHdl_Impl, void *, p ) } -// #116827# IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl) { @@ -1652,7 +1644,6 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl) m_pBoxArrowStyles->Disable(); - // #116827# m_pGridEdgeCaps->Disable(); } } @@ -1664,7 +1655,6 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl) if( m_pFlLineEnds->IsEnabled() ) { m_pBoxArrowStyles->Enable(); - // #116827# m_pGridEdgeCaps->Enable(); } } @@ -1705,7 +1695,6 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl) m_rXLSet.Put( XLineTransparenceItem( aItem ) ); - // #116827# FillXLSet_Impl(); m_pCtlPreview->Invalidate(); diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 7a8ea1920177..9bfb6e875329 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -496,7 +496,6 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs) if( bModified ) { // set reference points - // #75897# Rectangle aObjectRect(pView->GetAllMarkedRect()); pView->GetSdrPageView()->LogicToPagePos(aObjectRect); Point aPt = aObjectRect.Center(); diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index f8484ef51b2e..21bd6c6244b3 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -66,7 +66,6 @@ namespace const AnimationBitmap& rAnimBitmap = maAnimation.Get(sal_uInt16(nIndex)); sal_uInt32 nWaitTime(rAnimBitmap.nWait * 10); - // #115934# // Take care of special value for MultiPage TIFFs. ATM these shall just // show their first page. Later we will offer some switching when object // is selected. diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index e92d4556ad8c..d6d1a1c4d15e 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -279,7 +279,6 @@ Sequence< sal_Int8 > SAL_CALL TextHtmlToHTMLFormat( Sequence< sal_Int8 >& aTextH // we don't include '>' into the search // because the body tag allows parameters // e.g. <BODY param> - // #92840# OString startBodyTag( "<BODY" ); OString endBodyTag( "</BODY" ); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 4df265a9bb6c..3ead023e0311 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -2945,7 +2945,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt sal_Int32 nLines = pPortion->GetLines().Count(); sal_Int32 nLastLine = nLines-1; - // #108052# bool bEndOfParagraphWritten(false); if ( !IsVertical() ) diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index c48cac264bcb..c17591b8cc25 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -205,7 +205,6 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo) const sal_Int32 nPos = 0; sal_Int32 nOldPos = nPos; - // #108210# // Test if string length differ between original and CaseMapped bool bCaseMapLengthDiffers(aTxt.getLength() != rTxt.getLength()); @@ -238,7 +237,6 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo) const { if(bCaseMapLengthDiffers) { - // #108210# // If strings differ work preparing the necessary snippet to address that // potential difference const OUString aSnippet = rTxt.copy(nIdx + nOldPos, nPos-nOldPos); @@ -268,7 +266,6 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo) const { if(bCaseMapLengthDiffers) { - // #108210# // If strings differ work preparing the necessary snippet to address that // potential difference const OUString aSnippet = rTxt.copy(nIdx + nOldPos, nPos - nOldPos); @@ -293,7 +290,6 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo) const if(bCaseMapLengthDiffers) { - // #108210# // If strings differ work preparing the necessary snippet to address that // potential difference const OUString aSnippet = rTxt.copy(nIdx + nOldPos, nPos - nOldPos); @@ -355,7 +351,6 @@ Size SvxFont::GetPhysTxtSize( const OutputDevice *pOut, const OUString &rTxt, aTxtSize.setWidth( pOut->GetTextWidth( rTxt, nIdx, nLen ) ); else { - // #108210# const OUString aNewText = CalcCaseMap(rTxt); bool bCaseMapLengthDiffers(aNewText.getLength() != rTxt.getLength()); sal_Int32 nWidth(0L); @@ -539,7 +534,6 @@ void SvxFont::DrawPrev( OutputDevice *pOut, Printer* pPrinter, pOut->DrawStretchText( aPos, aSize.Width(), rTxt, nIdx, nTmp ); else { - // #108210# const OUString aNewText = CalcCaseMap(rTxt); bool bCaseMapLengthDiffers(aNewText.getLength() != rTxt.getLength()); diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 9de8512a70a5..bfee8c9e50ae 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -215,7 +215,6 @@ void SvxAccessibleTextIndex::SetEEIndex( sal_uInt16 nEEIndex, const SvxTextForwa break; } - // #106010# mnIndex += ::std::max(aFieldInfo.aCurrentText.getLength()-1, (sal_Int32)0); } } @@ -269,7 +268,6 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder& if( aFieldInfo.aPosition.nIndex > mnEEIndex ) break; - // #106010# mnEEIndex -= ::std::max(aFieldInfo.aCurrentText.getLength()-1, (sal_Int32)0); // we're within a field diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 0d90aa959ebd..5749777e89f6 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -291,7 +291,6 @@ EBulletInfo SvxEditEngineForwarder::GetBulletInfo( sal_Int32 ) const Rectangle SvxEditEngineForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const { - // #101701# // EditEngine's 'internal' methods like GetCharacterBounds() // don't rotate for vertical text. Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() ); @@ -346,7 +345,6 @@ Rectangle SvxEditEngineForwarder::GetParaBounds( sal_Int32 nPara ) const if( rEditEngine.IsVertical() ) { - // #101701# // Hargl. EditEngine's 'external' methods return the rotated // dimensions, 'internal' methods like GetTextHeight( n ) // don't rotate. diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index 4a3878e21aa8..556eaa6d9148 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -77,7 +77,6 @@ namespace bib Reference< awt::XControlModel > m_xGridModel; Reference< awt::XControl > m_xControl; Reference< awt::XControlContainer > m_xControlContainer; - // #100312# Reference< frame::XDispatchProviderInterception> m_xDispatchProviderInterception; protected: @@ -94,7 +93,6 @@ namespace bib void disposeGridWin(); const Reference< awt::XControlContainer >& getControlContainer() const { return m_xControlContainer; } - // #100312# const Reference< frame::XDispatchProviderInterception>& getDispatchProviderInterception() const { return m_xDispatchProviderInterception; } virtual void GetFocus() SAL_OVERRIDE; @@ -156,7 +154,6 @@ namespace bib // Peer as Child to the FrameWindow m_xControlContainer->addControl("GridControl", m_xControl); m_xGridWin=uno::Reference< awt::XWindow > (m_xControl, UNO_QUERY ); - // #100312# m_xDispatchProviderInterception=uno::Reference< frame::XDispatchProviderInterception > (m_xControl, UNO_QUERY ); m_xGridWin->setVisible( sal_True ); m_xControl->setDesignMode( sal_True ); @@ -248,7 +245,6 @@ namespace bib return xReturn; } - // #100312# Reference< frame::XDispatchProviderInterception > BibBeamer::getDispatchProviderInterception() { Reference< frame::XDispatchProviderInterception > xReturn; diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index 02e074a18a5e..9d165bbfcdc9 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/form/XForm.hpp> -// #100312# ----------------- #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <vcl/splitwin.hxx> #include "toolbar.hxx" @@ -65,7 +64,6 @@ namespace bib virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getControlContainer() SAL_OVERRIDE; public: - // #100312# ------------------- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > getDispatchProviderInterception(); diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 6aafbc4e7ad9..cb3b7f880fea 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -301,7 +301,6 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUSt } m_xDatMan->load(); - // #100312# ---------- m_pDatMan->RegisterInterceptor(pBeamer); if ( rListener.is() ) diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index 854820f34fda..967af889cc19 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -29,7 +29,6 @@ #include <cppuhelper/interfacecontainer.h> #include <com/sun/star/form/XLoadable.hpp> #include <comphelper/broadcasthelper.hxx> -// #100312# -------------------- #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <cppuhelper/implbase.hxx> @@ -41,14 +40,12 @@ namespace vcl { class Window; } namespace bib { class BibView; - // #100312# ----------- class BibBeamer; } class BibToolBar; struct BibDBDescriptor; -// #100312# --------------------- class BibInterceptorHelper :public cppu::WeakImplHelper< ::com::sun::star::frame::XDispatchProviderInterceptor > { @@ -89,7 +86,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSourceProps; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xParser; ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xFormCtrl; - // #100312# ------------------- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xFormDispatch; BibInterceptorHelper* m_pInterceptorHelper; @@ -180,7 +176,6 @@ public: void ResetIdentifierMapping() {sIdentifierMapping.clear();} ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController(); - // #100312# ---------- void RegisterInterceptor( ::bib::BibBeamer* pBibBeamer); bool HasActiveConnection(); diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index a2f2c59ee74e..1e0338596559 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -252,7 +252,6 @@ namespace pcr { if ( GetTitle() == _rNewTtile ) return; - // #99102# -------------- m_aFtTitle->SetText( _rNewTtile ); if ( m_pControlWindow ) m_pControlWindow->SetAccessibleName( _rNewTtile ); @@ -261,7 +260,6 @@ namespace pcr FullFillTitleString(); } - // #99102# --------------------------------------------------------- void OBrowserLine::FullFillTitleString() { if( m_pTheParent ) @@ -467,7 +465,6 @@ namespace pcr m_nNameWidth = nWidth+10; impl_layoutComponents(); } - // #99102# --------- FullFillTitleString(); } diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 90b622076627..a26fbdedb7c8 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -104,7 +104,6 @@ namespace pcr m_pPropBox->SetSizePixel(aSize); } - // #95343# --------------------------------------------------------------- ::com::sun::star::awt::Size OPropertyBrowserView::getMinimumSize() { Size aSize = GetOutputSizePixel(); diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index afbe6ea36fc2..acb9857245e5 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -70,7 +70,6 @@ namespace pcr class OPropertyEditor; struct OLineDescriptor; - // #95343#------------------------------------------------------------------------------------ typedef ::cppu::WeakImplHelper < ::com::sun::star::lang::XServiceInfo , ::com::sun::star::awt::XFocusListener , ::com::sun::star::awt::XLayoutConstrains @@ -170,7 +169,7 @@ namespace pcr // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XLayoutConstrains #95343# ---------------- + // XLayoutConstrains virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 76e2b19882bd..4576f226adc3 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -108,7 +108,6 @@ namespace pcr void setPageActivationHandler(const Link<LinkParamNone*,void>& _rHdl) { m_aPageActivationHandler = _rHdl; } - // #95343# ------------------------------- sal_Int32 getMinimumWidth(); sal_Int32 getMinimumHeight(); diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 642ef2944ceb..639414e6aaf4 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1435,7 +1435,6 @@ bool EscherPropertyContainer::CreateGraphicProperties( bool bMirrored = false; bool bRotate = true; bool bIsGraphicMtf = false; - // #121074# sal_Int16 nTransparency(0); sal_Int16 nRed(0); sal_Int16 nGreen(0); @@ -1636,7 +1635,6 @@ bool EscherPropertyContainer::CreateGraphicProperties( pGraphicAttr->SetMirrorFlags(BmpMirrorFlags::Horizontal); } - // #121074# if(nTransparency) { pGraphicAttr->SetTransparency((nTransparency * 255) / 100); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 15f32258b4c5..344e33c740b8 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4302,7 +4302,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r caller has not passed an own bounding ractangle. */ if ( rClientRect.IsEmpty() ) rClientRect = aObjData.aBoundRect; - nGroupShapeFlags = aObjData.nSpFlags; // #73013# + nGroupShapeFlags = aObjData.nSpFlags; } else if ( ( aObjData.eShapeType != mso_sptNil ) || IsProperty( DFF_Prop_pVertices ) || bGraphic ) { @@ -5752,7 +5752,6 @@ void SvxMSDffManager::CheckTxBxStoryChain() if( pObj->nTxBxComp ) { // group change? - // #156763# // the text id also contains an internal drawing container id // to distinguish between text id of drawing objects in different // drawing containers. diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 23d0cb49e861..dc46f3dc839d 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -833,7 +833,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi } sal_Int32 nFontDirection = GetPropertyValue( DFF_Prop_cdirFont, mso_cdir0 ); nTextRotationAngle -= nFontDirection * 9000; - if ( ( nFontDirection == 1 ) || ( nFontDirection == 3 ) ) // #104546# + if ( ( nFontDirection == 1 ) || ( nFontDirection == 3 ) ) { bVerticalText = !bVerticalText; } @@ -3997,7 +3997,7 @@ bool PPTParaSheet::Read( SdrPowerPointImport& rIn.ReadUInt32( nVal32 ); // reading the tabulators } if ( nPMask & 0x200000 ) - rIn.ReadUInt16( maParaLevel[ nLevel ].mnBiDi ); // #88602# + rIn.ReadUInt16( maParaLevel[ nLevel ].mnBiDi ); } nPMask >>= 22; diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index eec15ab0bc21..2bc4a5fbd9eb 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -568,7 +568,6 @@ bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) mbPresentation = Reference< XPresentationSupplier >( mxSrcDoc, UNO_QUERY ).is(); mpObjects = new ObjectMap; - // #110680# // mpSVGExport = new SVGExport( xDocHandler ); mpSVGExport = new SVGExport( xContext, xDocHandler, maFilterData ); diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 134b661b78a9..454c144b8331 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -44,8 +44,6 @@ #include "osl/mutex.hxx" #include "vcl/svapp.hxx" -// using ---------------------------------------------------------------- - using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; @@ -56,8 +54,6 @@ using namespace ::utl; - - struct FilterEntry { protected: @@ -114,8 +110,6 @@ sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList ) return m_aSubFilters.getLength(); } -// struct ElementEntry_Impl ---------------------------------------------- - struct ElementEntry_Impl { sal_Int16 m_nElementID; @@ -572,12 +566,10 @@ OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException, { OUString aPath = getDialog()->GetPath(); - // #97148# ---- if( m_aOldHideDirectory == aPath ) return m_aOldDisplayDirectory; m_aOldHideDirectory = aPath; - // #102204# ----- if( !getDialog()->ContentIsFolder( aPath ) ) { INetURLObject aFolder( aPath ); diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 3fa7c6e62fa4..8182624233f4 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -70,7 +70,6 @@ protected: OUString m_aDefaultName; OUString m_aCurrentFilter; - // #97148# -------------- OUString m_aOldDisplayDirectory; OUString m_aOldHideDirectory; diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index b30e07807f2a..9da9f7ab4c47 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -25,7 +25,6 @@ #include <vcl/msgbox.hxx> #include <vcl/lstbox.hxx> #include <vcl/svapp.hxx> -// #97148# --------------- #include "svl/ctypeitm.hxx" #include "svl/eitem.hxx" #include "unotools/viewoptions.hxx" @@ -165,7 +164,6 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu ) OUString aParentURL(aObject.GetMainURL(INetURLObject::NO_DECODE)); OUString aTitle; - // 97148# -------------------------------- if (!GetDialogParent()->ContentGetTitle(aParentURL, aTitle) || aTitle.isEmpty()) aTitle = aObject.getName(); diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 37f562eea485..b852cb4c0361 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -322,7 +322,6 @@ namespace comphelper :OMutexGuard( _pContext->getExternalLock( OAccessibleContextHelper::OAccessControl() ) ) ,OContextEntryGuard( _pContext ) { - // #102438# // Only lock the external mutex, // release the ::osl::Mutex of the OAccessibleContextHelper instance. // If you call into another UNO object with locked ::osl::Mutex, diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 566527506b23..8e6d419318f4 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -439,7 +439,6 @@ protected: void GetCtrlData(sal_uInt32 nOffsDgg); void GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLenDgg ); - // #156763# // Add internal drawing container id as parameter to the sub methods of // reading the control information about the drawing objects. // The drawing container id is used to distinguish the text ids of drawing diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 958dca09d58f..105036552eb3 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -226,7 +226,7 @@ public: void GetAttr( SfxItemSet& rSet ); void UpdatePreview(); // nach oben (private) - void DocumentReload(); // #83951# + void DocumentReload(); }; /************************************************************************* diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx index baf5ced3b878..547b2baa0e13 100644 --- a/include/svx/sdr/overlay/overlayobjectcell.hxx +++ b/include/svx/sdr/overlay/overlayobjectcell.hxx @@ -26,7 +26,6 @@ -// #114409# namespace sdr { namespace overlay diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 913ea4216c9d..8bcb82f0a326 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -267,7 +267,7 @@ private: SVX_DLLPRIVATE void ImpSetUIUnit(); SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit = false ); SVX_DLLPRIVATE void ImpReformatAllTextObjects(); - SVX_DLLPRIVATE void ImpReformatAllEdgeObjects(); // #103122# + SVX_DLLPRIVATE void ImpReformatAllEdgeObjects(); SVX_DLLPRIVATE void ImpCreateTables(); SVX_DLLPRIVATE void ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts = true); @@ -424,7 +424,6 @@ public: const SdrPage* GetPage(sal_uInt16 nPgNum) const; SdrPage* GetPage(sal_uInt16 nPgNum); sal_uInt16 GetPageCount() const; - // #109538# virtual void PageListChanged(); // Masterpages @@ -436,7 +435,6 @@ public: const SdrPage* GetMasterPage(sal_uInt16 nPgNum) const; SdrPage* GetMasterPage(sal_uInt16 nPgNum); sal_uInt16 GetMasterPageCount() const; - // #109538# virtual void MasterPageListChanged(); // modified flag. Is set automatically when something changes on the Pages diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 50bec71e3ecd..545a3fb61e78 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -88,7 +88,6 @@ namespace sdr class ObjectUser; } -// #110094# namespace sdr { namespace contact @@ -504,14 +503,12 @@ public: // Use SdrObjList::SetObjectNavigationPosition() instead. void SetNavigationPosition (const sal_uInt32 nPosition); - // #111111# // To make clearer that this method may trigger RecalcBoundRect and thus may be // expensive and sometimes problematic (inside a bigger object change You will get // non-useful BoundRects sometimes) i rename that method from GetBoundRect() to // GetCurrentBoundRect(). virtual const Rectangle& GetCurrentBoundRect() const; - // #111111# // To have a possibility to get the last calculated BoundRect e.g for producing // the first rectangle for repaints (old and new need to be used) without forcing // a RecalcBoundRect (which may be problematical and expensive sometimes) i add here @@ -926,7 +923,6 @@ public: // to use (0,0) as upper left and will be scaled to the given size in the matrix. virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); - // #116168# // give info if object is in destruction bool IsInDestruction() const; diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 07549de5edc9..441c80c78418 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -37,7 +37,6 @@ namespace sdr { namespace properties { // Helper Class SdrCaptObjGeoData -// #109872# class SdrCaptObjGeoData : public SdrTextObjGeoData { public: diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index 169ef35ccf2c..32eca3e9a195 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -29,7 +29,6 @@ namespace sdr { namespace properties { // Helper class SdrCircObjGeoData -// #109872# class SdrCircObjGeoData : public SdrTextObjGeoData { public: diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index cedb5fba4fad..21debe83c657 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -169,12 +169,10 @@ protected: bool bEdgeTrackDirty : 1; // sal_True=Verbindungsverlauf muss neu berechnet werden. bool bEdgeTrackUserDefined : 1; - // #109007# // Bool to allow supporession of default connects at object // inside test (HitTest) and object center test (see ImpFindConnector()) bool mbSuppressDefaultConnect : 1; - // #110649# // Flag value for avoiding death loops when calculating BoundRects // from circulary connected connectors. A coloring algorithm is used // here. When the GetCurrentBoundRect() calculation of a SdrEdgeObj @@ -186,12 +184,10 @@ protected: bool mbSuppressed : 1; public: - // #109007# // Interface to default connect suppression void SetSuppressDefaultConnect(bool bNew) { mbSuppressDefaultConnect = bNew; } bool GetSuppressDefaultConnect() const { return mbSuppressDefaultConnect; } - // #110649# bool IsBoundRectCalculationRunning() const { return mbBoundRectCalculationRunning; } protected: diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 97a6aa40cf30..36bd7ac8e1cb 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -98,7 +98,6 @@ private: SdrGraphicLink* pGraphicLink; // And here a pointer for linked graphics bool bMirrored:1; // True: the graphic is horizontal, which means it's mirrored along the y-axis - // #111096# // Flag for allowing text animation. Default is true. bool mbGrafAnimationAllowed:1; @@ -135,7 +134,6 @@ public: GraphicType GetGraphicType() const; - // #111096# // Keep ATM for SD. bool IsAnimated() const; bool IsEPS() const; @@ -202,7 +200,6 @@ public: bool IsMirrored() const { return bMirrored;} void SetMirrored( bool _bMirrored ); - // #111096# // Access to GrafAnimationAllowed flag void SetGrafAnimationAllowed(bool bNew); diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index e6acf370331b..58d211bd2032 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -150,7 +150,6 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getXModel() const; - // #109985# bool IsChart() const; bool IsReal3DChart() const; bool IsCalc() const; diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 3f48b3145a3c..8f722695acac 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -33,7 +33,6 @@ public: virtual void PageInDestruction(const SdrPage& rPage) SAL_OVERRIDE; private: - // #111111# // To make things more safe, remember the page, not a number SdrPage* mpShownPage; @@ -47,7 +46,6 @@ public: SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage = 0L); virtual ~SdrPageObj(); - // #111111# SdrPage* GetReferencedPage() const { return mpShownPage;} void SetReferencedPage(SdrPage* pNewPage); diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 82950f0f56a2..651a61d69369 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -213,7 +213,6 @@ protected: // um ein beschriftetes Grafikobjekt handelt. SdrObjKind eTextKind; - // #108784# // For text editing in SW Header/Footer it is necessary to be // able to set an offset for the text edit to allow text editing at the // position of the virtual object. This offset is used when setting up @@ -248,7 +247,6 @@ protected: bool bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame) bool bTextSizeDirty : 1; - // #101684# bool mbInEditMode : 1; // Is this text object in edit mode? // Fuer Objekt mit freier Groesse im Draw (Mengentext). Das Flag wird vom @@ -262,11 +260,9 @@ protected: // - Positions+Groesse Dialog bool bDisableAutoWidthOnDragging : 1; - // #111096# // Allow text suppression bool mbTextHidden : 1; - // #111096# // Flag for allowing text animation. Default is sal_true. bool mbTextAnimationAllowed : 1; @@ -338,7 +334,6 @@ protected: public: TYPEINFO_OVERRIDE(); - // #101684# bool IsInEditMode() const { return mbInEditMode; } // via eCharSet kann der CharSet der vorliegenden Datei uebergeben werden. @@ -591,12 +586,10 @@ public: // given vector void RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>& rCharWhichIds ); - // #111096# // Get necessary data for text scroll animation. ATM base it on a Text-Metafile and a // painting rectangle. Rotation is taken from the object. GDIMetaFile* GetTextScrollMetaFileAndRectangle(Rectangle& rScrollRectangle, Rectangle& rPaintRectangle); - // #111096# // Access to TextAnimationAllowed flag void SetTextAnimationAllowed(bool bNew); diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 5019b609420b..48c5b5bae554 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -45,7 +45,6 @@ class SdrView; class SdrPageObj; class SdrPageView; -// #110094# namespace sdr { namespace contact @@ -257,7 +256,6 @@ public: // #103834# Set background color for svx at SdrPageViews void SetApplicationBackgroundColor(Color aBackgroundColor); - // #109585# Color GetApplicationBackgroundColor() const { return maBackgroundColor;} // #103911# Set/Get document color for svx at SdrPageViews diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 0cf05b517101..c572544fff46 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -185,12 +185,10 @@ protected: bool mbVisualizeEnteredGroup : 1; bool mbAnimationPause : 1; - // #114898# // Flag which decides if buffered output for this view is allowed. When // set, PreRendering for PageView rendering will be used. Default is sal_False bool mbBufferedOutputAllowed : 1; - // #114898# // Flag which decides if buffered overlay for this view is allowed. When // set, the output will be buffered in an overlay vdev. When not, overlay is // directly painted to OutDev. Default is sal_False. @@ -209,7 +207,6 @@ protected: bool mbHideFormControl : 1; // hide form controls only public: - // #114898# // Interface for PagePaintingAllowed flag bool IsBufferedOutputAllowed() const; void SetBufferedOutputAllowed(bool bNew); @@ -420,7 +417,7 @@ public: void setHideFormControl(bool bNew) { if(bNew != (bool)mbHideFormControl) mbHideFormControl = bNew; } void SetGridCoarse(const Size& rSiz) { maGridBig=rSiz; } - void SetGridFine(const Size& rSiz) { maGridFin=rSiz; if (maGridFin.Height()==0) maGridFin.Height()=maGridFin.Width(); if (mbGridVisible) InvalidateAllWin(); } // #40479# + void SetGridFine(const Size& rSiz) { maGridFin=rSiz; if (maGridFin.Height()==0) maGridFin.Height()=maGridFin.Width(); if (mbGridVisible) InvalidateAllWin(); } const Size& GetGridCoarse() const { return maGridBig; } const Size& GetGridFine() const { return maGridFin; } diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index 83aafd5587e3..a7f62e40d8e4 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -299,7 +299,6 @@ public: void enableLayerExport( bool bEnable = true ) { mbExportLayer = bEnable; } bool IsLayerExportEnabled() const { return mbExportLayer; } - // #88546# /** defines if the export should increment the progress bar or not */ void enableHandleProgressBar( bool bEnable = true ) { mbHandleProgressBar = bEnable; } bool IsHandleProgressBarEnabled() const { return mbHandleProgressBar; } diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index 3e72562e0eff..ca685da25a6c 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -411,7 +411,6 @@ public: static SvXMLImportPropertyMapper* CreateShapePropMapper( const com::sun::star::uno::Reference< com::sun::star::frame::XModel>& rModel, SvXMLImport& rImport ); - // #88546# /** defines if the import should increment the progress bar or not */ void enableHandleProgressBar( bool bEnable = true ); bool IsHandleProgressBarEnabled() const; diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 923514a2f939..9783a9bed237 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -713,7 +713,6 @@ public: /// reset the last open redline ID void ResetOpenRedlineId(); - // #107848# /** redlining : Setter to remember the fact we are inside/outside * a <text:deletion> element (deleted redline section) */ void SetInsideDeleteContext(bool const bNew); diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index ceb6f782fefb..a0d1378c0a30 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -201,7 +201,6 @@ protected: void _CreateDataStylesImport(); public: - // #110680# // SvXMLImport( sal_uInt16 nImportFlags = IMPORT_ALL ) throw(); SvXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index b02ec22a2a6f..e7874db098ea 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -291,7 +291,6 @@ static OUString & getIniFileName_Impl() return *pStaticName; } -// #111772# // ensure the given file url has no final slash inline void EnsureNoFinalSlash (rtl::OUString & url) diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index dd7e193d0703..0c9ad39acfc5 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -94,7 +94,6 @@ void ScDocument::TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDes SdrObject* pOldObject = aIter.Next(); while (pOldObject) { - // #116235# SdrObject* pNewObject = pOldObject->Clone(); // SdrObject* pNewObject = pOldObject->Clone( pNewPage, pDrawLayer ); pNewObject->SetModel(pDrawLayer); @@ -221,7 +220,6 @@ void ScDocument::SetDrawPageSize(SCTAB nTab) bool ScDocument::IsChart( const SdrObject* pObject ) { - // #109985# // IsChart() implementation moved to svx drawinglayer if(pObject && OBJ_OLE2 == pObject->GetObjIdentifier()) { diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 50db4f4f05c6..41c526ee7ff5 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -2950,7 +2950,7 @@ bool ScCompiler::IsReference( const OUString& rName ) return false; if ( cDecSep == '.' && (ch2 == 'E' || ch2 == 'e') // E + - digit && (GetCharTableFlags( pTabSep[2], pTabSep[1] ) & SC_COMPILER_C_VALUE_EXP) ) - { // #91053# + { // If it is an 1.E2 expression check if "1" is an existent sheet // name. If so, a desired value 1.E2 would have to be entered as // 1E2 or 1.0E2 or 1.E+2, sorry. Another possibility would be to diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index a72459b1d2e7..e1ddb0ddfc87 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -336,7 +336,6 @@ sal_Int16 ScXMLExport::GetMeasureUnit() return xProperties->getMetric(); } -// #110680# ScXMLExport::ScXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlag) diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 10dade62d3da..e4802e35ad2f 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -124,7 +124,6 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw( uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) { - // #110680# // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_ALL); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_getImplementationName(), SvXMLImportFlags::ALL )); } @@ -143,7 +142,6 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() t uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) { - // #110680# // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_META); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META )); } @@ -162,7 +160,6 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) { - // #110680# // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlagsSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS)); } @@ -181,7 +178,6 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames( uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) { - // #110680# // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::META|SvXMLImportFlags::STYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::SETTINGS|SvXMLImportFlags::FONTDECLS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Content_getImplementationName(), SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS)); } @@ -200,7 +196,6 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) { - // #110680# // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::SETTINGS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Settings_getImplementationName(), SvXMLImportFlags::SETTINGS )); } diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 81a9520891e3..2f44e39df90c 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -978,7 +978,6 @@ protected: virtual XMLShapeImportHelper* CreateShapeImport() SAL_OVERRIDE; public: - // #110680# ScXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlag); diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index a0883bfd0ce9..c2182667c703 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -61,13 +61,10 @@ #include "dragdata.hxx" #include "clipdata.hxx" -// #108584# #include "scitems.hxx" -// #108584# #include <editeng/eeitem.hxx> -// #108584# #include <editeng/fhgtitem.hxx> #include <vcl/svapp.hxx> @@ -463,7 +460,6 @@ bool ScDrawTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, voi SdrModel* pDrawModel = static_cast<SdrModel*>(pUserObject); rxOStm->SetBufferSize( 0xff00 ); - // #108584# // for the changed pool defaults from drawing layer pool set those // attributes as hard attributes to preserve them for saving const SfxItemPool& rItemPool = pModel->GetItemPool(); diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index d999bf2096ba..aeefe44bbab3 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -300,7 +300,6 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) } break; - // #97016# case KEY_TAB: { // in calc do NOT start draw object selection using TAB/SHIFT-TAB when @@ -357,7 +356,6 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) } break; - // #97016# case KEY_END: { // in calc do NOT select the last draw object when @@ -382,7 +380,6 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) } break; - // #97016# case KEY_HOME: { // in calc do NOT select the first draw object when @@ -407,7 +404,6 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) } break; - // #97016# case KEY_UP: case KEY_DOWN: case KEY_LEFT: @@ -580,7 +576,6 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) } break; - // #97016# case KEY_SPACE: { // in calc do only something when draw objects are selected diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index b9af88a0851e..ae2bc5d6f0bb 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -95,7 +95,6 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou RIGHT_DOWN }; - // #114409# std::unique_ptr<sdr::overlay::OverlayObjectList> mpOOCursors; std::unique_ptr<sdr::overlay::OverlayObjectList> mpOOSelection; std::unique_ptr<sdr::overlay::OverlayObjectList> mpOOSelectionBorder; @@ -403,7 +402,6 @@ public: void UpdateDPFromFieldPopupMenu(); bool UpdateVisibleRange(); - // #114409# void CursorChanged(); void DrawLayerCreated(); bool ContinueOnlineSpelling(); @@ -430,7 +428,6 @@ public: void UpdateAllOverlays(); protected: - // #114409# void ImpCreateOverlayObjects(); void ImpDestroyOverlayObjects(); diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 861faf98dcb9..2dd5dfbb10d7 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -172,7 +172,6 @@ private: ScTabViewShell* pViewShell; // for connect from visible plug-ins - // #114135# FmFormView* pDrawView; // SdrView to paint to bool bEditMode; // InPlace edited cell - do not output @@ -276,7 +275,6 @@ public: void SetEditObject( SdrObject* pObj ) { pEditObj = pObj; } void SetViewShell( ScTabViewShell* pSh ) { pViewShell = pSh; } - // #114135# void SetDrawView( FmFormView* pNew ) { pDrawView = pNew; } void SetSolidBackground( bool bSet ) { bSolidBackground = bSet; } diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index 91ef6c505da1..fd15cf13d101 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -474,7 +474,6 @@ String SCSTR_UNDO_GRAFFILTER Text [ en-US ] = "Image Filter" ; }; -// #98185# String STR_CAPTION_DEFAULT_TEXT { Text [ en-US ] = "Text" ; diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 15d694a2ef18..e1835bd0d6dd 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1536,7 +1536,6 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec FmFormView* pDrawView = NULL; - // #114135# ScDrawLayer* pModel = rDoc.GetDrawLayer(); if( pModel ) diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 9b1f66c009b4..31463d1b89c1 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -1095,7 +1095,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) void ScEditShell::GetAttrState(SfxItemSet &rSet) { - if ( !pViewData->HasEditView( pViewData->GetActivePart() ) ) // #125326# + if ( !pViewData->HasEditView( pViewData->GetActivePart() ) ) { lcl_DisableAll( rSet ); return; @@ -1184,7 +1184,7 @@ OUString ScEditShell::GetSelectionText( bool bWholeWord ) { OUString aStrSelection; - if ( pViewData->HasEditView( pViewData->GetActivePart() ) ) // #125326# + if ( pViewData->HasEditView( pViewData->GetActivePart() ) ) { if ( bWholeWord ) { diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index e3d918c46144..c32c9d3401cd 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -542,7 +542,6 @@ ScGridWindow::~ScGridWindow() void ScGridWindow::dispose() { - // #114409# ImpDestroyOverlayObjects(); mpFilterBox.disposeAndClear(); @@ -5573,7 +5572,6 @@ bool ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang return false; } -// #114409# void ScGridWindow::DrawLayerCreated() { SetMapMode( GetDrawMapMode() ); @@ -5780,7 +5778,6 @@ bool ScGridWindow::InsideVisibleRange( SCCOL nPosX, SCROW nPosY ) return maVisibleRange.isInside(nPosX, nPosY); } -// #114409# void ScGridWindow::CursorChanged() { // here the created OverlayObjects may be transformed in later versions. For @@ -5789,7 +5786,6 @@ void ScGridWindow::CursorChanged() UpdateCursorOverlay(); } -// #114409# void ScGridWindow::ImpCreateOverlayObjects() { UpdateCursorOverlay(); @@ -5801,7 +5797,6 @@ void ScGridWindow::ImpCreateOverlayObjects() UpdateShrinkOverlay(); } -// #114409# void ScGridWindow::ImpDestroyOverlayObjects() { DeleteCursorOverlay(); diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 80770641142e..2937507e1e68 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -186,7 +186,6 @@ bool ScGridWindow::DrawKeyInput(const KeyEvent& rKEvt) void ScGridWindow::DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, sal_uLong nLayer ) { - // #109985# const ScViewOptions& rOpts = pViewData->GetOptions(); // use new flags at SdrPaintView for hiding objects diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 0668a5f1cf65..5c2952202ecb 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -165,7 +165,7 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, mnPPTY( nPixelPerTwipsY ), pEditObj( NULL ), pViewShell( NULL ), - pDrawView( NULL ), // #114135# + pDrawView( NULL ), bEditMode( false ), nEditCol( 0 ), nEditRow( 0 ), diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index 2e8c4355e668..496cc5adfa65 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -146,7 +146,6 @@ void ScOutputData::PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOf } } - // #109985# if(bHideAllDrawingLayer || (!mpDoc->GetDrawLayer())) { return; @@ -159,7 +158,6 @@ void ScOutputData::PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOf mpDev->SetMapMode( MapMode( MAP_100TH_MM, rMMOffset, aOldMode.GetScaleX(), aOldMode.GetScaleY() ) ); } - // #109985# DrawSelectiveObjects( nLayer ); if (!bMetaFile) @@ -168,7 +166,6 @@ void ScOutputData::PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOf } } -// #109985# void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer) { ScDrawLayer* pModel = mpDoc->GetDrawLayer(); @@ -196,7 +193,6 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer) DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient ); } - // #109985# if(pViewShell || pDrawView) { SdrView* pLocalDrawView = (pDrawView) ? pDrawView : pViewShell->GetSdrView(); @@ -217,7 +213,6 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer) // parts only for the screen -// #109985# void ScOutputData::DrawingSingle(const sal_uInt16 nLayer) { bool bHad = false; diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 6bf5469e81a4..37851a06f621 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -129,7 +129,7 @@ ScPreview::ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* nHeaderHeight ( 0 ), nFooterHeight ( 0 ) { - SetOutDevViewType( OUTDEV_VIEWTYPE_PRINTPREVIEW ); //#106611# + SetOutDevViewType( OUTDEV_VIEWTYPE_PRINTPREVIEW ); SetBackground(); SetHelpId( HID_SC_WIN_PREVIEW ); @@ -158,7 +158,6 @@ void ScPreview::UpdateDrawView() // nTab must be right ScDocument& rDoc = pDocShell->GetDocument(); ScDrawLayer* pModel = rDoc.GetDrawLayer(); // is not 0 - // #114135# if ( pModel ) { SdrPage* pPage = pModel->GetPage(nTab); diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 5b775a8d6aa3..74f72158b7d2 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -515,7 +515,6 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr aOutputData.SetShowNullValues(bNullVal); aOutputData.SetShowFormulas(bFormula); - // #114135# ScDrawLayer* pModel = pDoc->GetDrawLayer(); std::unique_ptr<FmFormView> pDrawView; @@ -1562,7 +1561,6 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScOutputData aOutputData( pDev, OUTTYPE_PRINTER, aTabInfo, pDoc, nPrintTab, nScrX, nScrY, nX1, nY1, nX2, nY2, nScaleX, nScaleY ); - // #114135# aOutputData.SetDrawView( pDrawView ); // test if all paint parts are hidden, then a paint is not necessary at all diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 6876070fcda2..68744a0c21cc 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -1386,7 +1386,6 @@ void ScTabView::MakeDrawLayer() // pDrawView is set per Notify OSL_ENSURE(pDrawView,"ScTabView::MakeDrawLayer does not work"); - // #114409# for(sal_uInt16 a(0); a < 4; a++) { if(pGridWin[a]) diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index fc5df5226613..c864d2d053d2 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -172,7 +172,6 @@ void ScTabView::ShowAllCursors() { pGridWin[i]->ShowCursor(); - // #114409# pGridWin[i]->CursorChanged(); } } @@ -181,7 +180,6 @@ void ScTabView::ShowCursor() { pGridWin[aViewData.GetActivePart()]->ShowCursor(); - // #114409# pGridWin[aViewData.GetActivePart()]->CursorChanged(); } diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 9887de002bce..a91af4d4c39c 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -256,7 +256,6 @@ void ScTabView::DoAddWin( ScGridWindow* pWin ) { pDrawView->AddWindowToPaintView(pWin, 0); - // #114409# pWin->DrawLayerCreated(); } } diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 67d5a391d3b7..151a57bc9594 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1725,7 +1725,6 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, GetBorderSize( aBorder, Size() ); SetBorderPixel( aBorder ); - // #114409# MakeDrawLayer(); } diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index c92fc55b65bc..cd36fea739e4 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -373,7 +373,6 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) } break; - // #98721# case SID_FM_CREATE_FIELDCONTROL: { SFX_REQUEST_ARG( rReq, pDescriptorItem, SfxUnoAnyItem, SID_FM_DATACCESS_DESCRIPTOR, false ); diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 1300c8ebcd00..2e4da5c4cd3b 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -1106,7 +1106,7 @@ double GetOddfprice( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 / // If you change this to not unconditionally throw, the // SAL_WNOUNREACHABLE_CODE_PUSH/POP around the caller in // financial.cxx can be removed. - throw uno::RuntimeException(); // #87380# + throw uno::RuntimeException(); } @@ -1192,7 +1192,7 @@ double GetOddfyield( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 / // If you change this to not unconditionally throw, the // SAL_WNOUNREACHABLE_CODE_PUSH/POP around the caller in // financial.cxx can be removed. - throw uno::RuntimeException(); // #87380# + throw uno::RuntimeException(); } diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index e54f896dbf29..578f6f74c779 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -100,7 +100,6 @@ public: void SettingsChanged(); bool GetAutoDetectSystemHC() {return m_bAutoDetectSystemHC;} - // #100822# DECL_LINK_TYPED( DataChangedEventListener, VclSimpleEvent&, void ); void ImplUpdateApplicationSettings(); @@ -206,14 +205,12 @@ ColorConfig_Impl::ColorConfig_Impl(bool bEditMode) : ImplUpdateApplicationSettings(); - // #100822# ::Application::AddEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) ); } ColorConfig_Impl::~ColorConfig_Impl() { - // #100822# ::Application::RemoveEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) ); } diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 62eba2033a18..584f4dcc8857 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -131,7 +131,6 @@ public: static void LockBroadcast(); static void UnlockBroadcast(); - // #100822# DECL_LINK_TYPED( DataChangedEventListener, VclSimpleEvent&, void ); }; @@ -209,14 +208,12 @@ ExtendedColorConfig_Impl::ExtendedColorConfig_Impl(bool bEditMode) : } Load(OUString()); - // #100822# ::Application::AddEventListener( LINK(this, ExtendedColorConfig_Impl, DataChangedEventListener) ); } ExtendedColorConfig_Impl::~ExtendedColorConfig_Impl() { - // #100822# ::Application::RemoveEventListener( LINK(this, ExtendedColorConfig_Impl, DataChangedEventListener) ); } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 8b0e3683bfef..fa2a2c4b3e2a 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -176,7 +176,6 @@ void FilterMatch::createWildCardFilterList(const OUString& _rFilterList,::std::v _rFilters.push_back( WildCard(OUString("*")) ); } } -// class ViewTabListBox_Impl --------------------------------------------- class ViewTabListBox_Impl : public SvHeaderTabListBox { @@ -229,7 +228,6 @@ public: virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopentry ) SAL_OVERRIDE; }; -// class NameTranslationList ----------------------------------------- // provides a list of _unique_ Entries class NameTranslationList { // contains a list of substitutes of strings for a given folder (as URL) @@ -309,8 +307,6 @@ const OUString* NameTranslationList::Translate( const OUString& rName ) const return (iter != m_Translation.end()) ? &iter->second : nullptr; } -// class NameTranslator_Impl ------------------------------------------ - // enables the user to get string substitutions (translations for the content) for a given folder // see more explanations above in the description for NameTranslationList class NameTranslator_Impl : public ::svt::IContentTitleTranslation @@ -393,7 +389,6 @@ public: void CancelRunningAsyncAction(); void OpenFolder_Impl(); - // #83004# ------- static void ReplaceTabWithString( OUString& aValue ); void CreateDisplayText_Impl(); void SortFolderContent_Impl(); @@ -492,9 +487,6 @@ OUString CreateExactSizeText( sal_Int64 nSize ) } -// class ViewTabListBox_Impl --------------------------------------------- - - ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin, SvtFileView_Impl* pParent, FileViewFlags nFlags ) : @@ -1000,7 +992,6 @@ bool ViewTabListBox_Impl::Kill( const OUString& rContent ) return bRet; } -// class SvtFileView ----------------------------------------------------- SvtFileView::SvtFileView( vcl::Window* pParent, WinBits nBits, bool bOnlyFolder, bool bMultiSelection, bool bShowType ) : @@ -1927,7 +1918,6 @@ void SvtFileView_Impl::CreateDisplayText_Impl() { // title, type, size, date aValue = (*aIt)->GetTitle(); - // #83004# -------------------- ReplaceTabWithString( aValue ); aValue += aTab; aValue += (*aIt)->maType; diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 1e6f7699aae6..aac8af7d8a00 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -155,7 +155,6 @@ void SvImpLBox::UpdateStringSorter() } } -// #97680# ---------------------- short SvImpLBox::UpdateContextBmpWidthVector( SvTreeListEntry* pEntry, short nWidth ) { DBG_ASSERT( pView->pModel, "View and Model aren't valid!" ); diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 6b9a375083c1..9db0d062bc5e 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -23,9 +23,7 @@ #include <vcl/seleng.hxx> #include <vcl/scrbar.hxx> #include <vcl/vclevent.hxx> -// #102891# ---------------- #include <unotools/intlwrapper.hxx> -// #97680# ----------------- #include <vector> #include "svtaccessiblefactory.hxx" @@ -155,10 +153,8 @@ private: Point aEditClickPos; Idle aEditIdle; - // #102891# ------------------- comphelper::string::NaturalStringSorter *m_pStringSorter; - // #97680# -------------------- std::vector< short > aContextBmpWidthVector; DECL_LINK_TYPED(EditTimerCall, Idle *, void); @@ -230,7 +226,6 @@ private: void UpdateStringSorter(); - // #97680# -------------------- short UpdateContextBmpWidthVector( SvTreeListEntry* pEntry, short nWidth ); void UpdateContextBmpWidthMax( SvTreeListEntry* pEntry ); void UpdateContextBmpWidthVectorFromMovedEntry( SvTreeListEntry* pEntry ); diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index d61257ccd41e..1a170b5f7817 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -1395,7 +1395,6 @@ namespace accessibility if( maEventOpenFrames == 0 ) { - // #103483# /* All information should have arrived * now, process queue. As stated in the * above bug, we can often avoid throwing diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 2534b94867e7..df2a0be719df 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -354,7 +354,6 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con else if ( ( eFillStyle == drawing::FillStyle_BITMAP ) || ( eFillStyle == drawing::FillStyle_GRADIENT ) || bUseExtrusionColor ) bUseTwoFillStyles = true; - // #116336# // If shapes are mirrored once (mirroring two times correct geometry again) // double-sided at the object and two-sided-lighting at the scene need to be set. diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 1775f97ca6ba..e0d8145b34a0 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -211,7 +211,6 @@ void SvxXConnectionPreview::Paint(vcl::RenderContext& rRenderContext, const Rect { if (pObjList) { - // #110094# // This will not work anymore. To not start at Adam and Eve, i will // ATM not try to change all this stuff to really using an own model // and a view. I will just try to provide a mechanism to paint such diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx index 26ea71f7e73d..6345748396a2 100644 --- a/svx/source/engine3d/svx3ditems.cxx +++ b/svx/source/engine3d/svx3ditems.cxx @@ -89,7 +89,6 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal) {} -// #107245# Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal) @@ -118,7 +117,6 @@ SfxPoolItem * Svx3DSmoothNormalsItem::Clone(SfxItemPool *) const return new Svx3DSmoothNormalsItem(*this); } -// #107245# Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal) @@ -147,7 +145,6 @@ SfxPoolItem * Svx3DSmoothLidsItem::Clone(SfxItemPool *) const return new Svx3DSmoothLidsItem(*this); } -// #107245# Svx3DCharacterModeItem::Svx3DCharacterModeItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal) @@ -176,7 +173,6 @@ SfxPoolItem * Svx3DCharacterModeItem::Clone(SfxItemPool *) const return new Svx3DCharacterModeItem(*this); } -// #107245# Svx3DCloseFrontItem::Svx3DCloseFrontItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal) @@ -205,7 +201,6 @@ SfxPoolItem * Svx3DCloseFrontItem::Clone(SfxItemPool *) const return new Svx3DCloseFrontItem(*this); } -// #107245# Svx3DCloseBackItem::Svx3DCloseBackItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal) diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 1ace5f84963b..223081356ac2 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1135,7 +1135,6 @@ void FmGridControl::DeleteSelectedRows() { ::com::sun::star::util::URL aUrl; aUrl.Complete = FMURL_CONFIRM_DELETION; - // #100312# ------------ Reference< ::com::sun::star::util::XURLTransformer > xTransformer( ::com::sun::star::util::URLTransformer::create(::comphelper::getProcessComponentContext()) ); xTransformer->parseStrict( aUrl ); diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 7085bc6c3788..8f2c2a0e5628 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -444,7 +444,6 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection ) SetText( sTitle ); - // #95343# --------------------------------- Reference< ::com::sun::star::awt::XLayoutConstrains > xLayoutConstrains( m_xBrowserController, UNO_QUERY ); if( xLayoutConstrains.is() ) { diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 82d858640ef2..88b1850fcf76 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1743,7 +1743,6 @@ namespace svxform ++it; // In case there is no shape for the current entry, we keep the entry in m_arrCurrentSelection, // since then we can definitely remove it. - // #103597# } else ++it; diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx index e3a80d4e32b9..f29ed6f24439 100644 --- a/svx/source/inc/xmlxtexp.hxx +++ b/svx/source/inc/xmlxtexp.hxx @@ -34,7 +34,6 @@ namespace com { namespace sun { namespace star { class SvxXMLXTableExportComponent : public SvXMLExport { public: - // #110680# SvxXMLXTableExportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const OUString& rFileName, diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx index f3a6f32e0b88..1dc87c63c3a7 100644 --- a/svx/source/inc/xmlxtimp.hxx +++ b/svx/source/inc/xmlxtimp.hxx @@ -33,7 +33,6 @@ namespace com { namespace sun { namespace star { class SvxXMLXTableImport : public SvXMLImport { public: - // #110680# SvxXMLXTableImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & rTable, diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx index 73ae66b43f40..cfd772a57595 100644 --- a/svx/source/sdr/overlay/overlayobjectcell.cxx +++ b/svx/source/sdr/overlay/overlayobjectcell.cxx @@ -30,7 +30,6 @@ using namespace ::basegfx; -// #114409# namespace sdr { namespace overlay diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 325558b9fd0b..0fbcd16ed873 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -40,7 +40,6 @@ #include <svx/svdtrans.hxx> #include <svx/svdpage.hxx> -// #114265# #include <svl/smplhint.hxx> @@ -549,7 +548,6 @@ namespace sdr SfxStyleSheet* pNewStSh = 0L; SdrModel* pModel = rObj.GetModel(); - // #111111# // Do nothing if object is in destruction, else a StyleSheet may be found from // a StyleSheetPool which is just being deleted itself. and thus it would be fatal // to register as listener to that new StyleSheet. diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index c3067da99641..f0567e8b9f97 100644 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx @@ -48,7 +48,6 @@ namespace sdr : BaseProperties(rProps, rObj), mpEmptyItemSet(0L) { - // #115593# // do not gererate an assert, else derivations like PageProperties will generate an assert // using the Clone() operator path. } diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index 3e8f6155caeb..c4e9d91a17b8 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -259,7 +259,6 @@ namespace sdr // also clear local ItemSet, it's only temporary for group objects anyways. if(mpItemSet) { - // #121905# // copy/paste is still using clone operators and MoveToItemPool functionality. // Since SfxItemSet contains a pool pointer, ClearItem is not enough here. // The ItemSet for merge is constructed on demand, so it's enough here to diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 92249181c963..b6a764c3b28e 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -332,7 +332,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang const SdrTextObj* pText = PTR_CAST(SdrTextObj,GetTextEditObject()); bool bTextFrame(pText && pText->IsTextFrame()); bool bFitToSize(pTextEditOutliner->GetControlWord() & EEControlBits::STRETCHING); - bool bModifyMerk(pTextEditOutliner->IsModified()); // #43095# + bool bModifyMerk(pTextEditOutliner->IsModified()); Rectangle aBlankRect(rOutlView.GetOutputArea()); aBlankRect.Union(aMinTextEditArea); Rectangle aPixRect(rTargetDevice.LogicToPixel(aBlankRect)); @@ -350,7 +350,6 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang if(!bModifyMerk) { - // #43095# pTextEditOutliner->ClearModifyFlag(); } @@ -782,7 +781,6 @@ bool SdrObjEditView::SdrBeginTextEdit( maHdlList.SetMoveOutside(true); - // #i72757# // Since IsMarkHdlWhenTextEdit() is ignored, it is necessary // to call AdjustMarkHdl() always. AdjustMarkHdl(); @@ -1096,7 +1094,6 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) pTEObj->SetTextAnimationAllowed(true); } - // #i72757# // Since IsMarkHdlWhenTextEdit() is ignored, it is necessary // to call AdjustMarkHdl() always. AdjustMarkHdl(); @@ -1672,7 +1669,6 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) BegUndo(aStr); AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*mxTextEditObj.get())); - // #i43537# // If this is a text object also rescue the OutlinerParaObject since // applying attributes to the object may change text layout when // multiple portions exist with multiple formats. If a OutlinerParaObject diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index fd6225a64b0b..38de48867f00 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -41,7 +41,6 @@ #include <svx/dialmgr.hxx> #include <svx/xflftrit.hxx> -// #105678# #include <svx/svdopath.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index b12a68dfac5f..72b86ac2f629 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1492,7 +1492,6 @@ void SdrObjCustomShape::NbcSetSnapRect( const Rectangle& rRect ) ImpJustifyRect(maRect); InvalidateRenderGeometry(); - // #115391# AdaptTextMinSize(); ImpCheckShear(); @@ -1516,7 +1515,6 @@ void SdrObjCustomShape::NbcSetLogicRect( const Rectangle& rRect ) ImpJustifyRect(maRect); InvalidateRenderGeometry(); - // #115391# AdaptTextMinSize(); SetRectsDirty(); @@ -2223,7 +2221,6 @@ bool SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) { DragCreateObject( rStat ); - // #115391# AdaptTextMinSize(); SetRectsDirty(); diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index f9d2811c3ac2..1e0e217363ed 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -1668,7 +1668,6 @@ SdrOle2Obj& SdrOle2Obj::assignFrom( //TODO/LATER: who takes over control of my old object?! if( &rObj != this ) { - // #116235# // ImpAssign( rObj ); const SdrOle2Obj& rOle2Obj = static_cast< const SdrOle2Obj& >( rObj ); diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 36de7ba1de9c..4fce336ca46a 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -211,7 +211,6 @@ bool SdrTextObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) rStat.TakeCreateRect(maRect); ImpJustifyRect(maRect); - // #115391# AdaptTextMinSize(); SetRectsDirty(); diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 0d5b0e1e5221..df967bb5ff4d 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -60,7 +60,6 @@ void SdrTextObj::NbcSetSnapRect(const Rectangle& rRect) maRect = rRect; ImpJustifyRect(maRect); - // #115391# AdaptTextMinSize(); ImpCheckShear(); @@ -78,7 +77,6 @@ void SdrTextObj::NbcSetLogicRect(const Rectangle& rRect) maRect = rRect; ImpJustifyRect(maRect); - // #115391# AdaptTextMinSize(); SetRectsDirty(); @@ -175,7 +173,6 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract ImpJustifyRect(maRect); - // #115391# AdaptTextMinSize(); if(bTextFrame && (!pModel || !pModel->IsPasteResize())) diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 6b6ac206d117..8d2d3430ad03 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -125,7 +125,6 @@ bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdr // case HINT_LAYERSETCHG: // layer set changed // case HINT_LAYERSETORDERCHG: // layer set order changed (Insert/Remove/ChangePos) -// #115423# // case HINT_PAGECHG: // page changed // aEvent.EventName = "PageModified"; // pPage = pSdrHint->GetPage(); diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 6e99378b6a0b..8e265579c7bc 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -525,7 +525,6 @@ void SvxTextEditSourceImpl::dispose() void SvxTextEditSourceImpl::SetupOutliner() { - // #101029# // only for UAA edit source: setup outliner equivalently as in // SdrTextObj::Paint(), such that formatting equals screen // layout @@ -548,7 +547,6 @@ void SvxTextEditSourceImpl::SetupOutliner() void SvxTextEditSourceImpl::UpdateOutliner() { - // #104157# // only for UAA edit source: update outliner equivalently as in // SdrTextObj::Paint(), such that formatting equals screen // layout @@ -970,7 +968,6 @@ Point SvxTextEditSourceImpl::LogicToPixel( const Point& rPoint, const MapMode& r } else if( IsValid() && mpModel ) { - // #101029# Point aPoint1( rPoint ); aPoint1.X() += maTextOffset.X(); aPoint1.Y() += maTextOffset.Y(); @@ -1008,7 +1005,6 @@ Point SvxTextEditSourceImpl::PixelToLogic( const Point& rPoint, const MapMode& r Point aPoint2( OutputDevice::LogicToLogic( aPoint1, MapMode(mpModel->GetScaleUnit()), rMapMode ) ); - // #101029# aPoint2.X() -= maTextOffset.X(); aPoint2.Y() -= maTextOffset.Y(); diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index e68c61b0cd43..9bf1feaa8d1f 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -143,7 +143,6 @@ private: -// #110680# SvxXMLXTableExportComponent::SvxXMLXTableExportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, const OUString& rFileName, diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index 3bdc6ac24ed5..98864bd3dfe0 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -323,7 +323,6 @@ void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& r -// #110680# SvxXMLXTableImport::SvxXMLXTableImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, const uno::Reference< XNameContainer > & rTable, diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi index 6d1bd32b7105..b27a19b103de 100644 --- a/sw/sdi/_frmsh.sdi +++ b/sw/sdi/_frmsh.sdi @@ -288,7 +288,7 @@ interface BaseTextFrame [ ExecMethod = ExecFrameStyle ; StateMethod = GetLineStyleState ; - Export = FALSE; //#44439# + Export = FALSE; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi index b8be3011e72f..7d81beefad35 100644 --- a/sw/sdi/_tabsh.sdi +++ b/sw/sdi/_tabsh.sdi @@ -322,7 +322,7 @@ interface BaseTextTable [ ExecMethod = ExecTableStyle ; StateMethod = GetLineStyleState ; - Export = FALSE; //#44439# + Export = FALSE; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 4a1b5494a5ce..fe5adb9cc310 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -3229,7 +3229,6 @@ bool SwFlyFrameFormat::IsBackgroundBrushInherited() const return false; } -// #125892# SwHandleAnchorNodeChg::SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat, const SwFormatAnchor& _rNewAnchorFormat, SwFlyFrm* _pKeepThisFlyFrm ) diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 6bb30287662a..2b4f3939d6b5 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1231,7 +1231,6 @@ void SwContentFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/) //Set FixSize. VarSize is being adjusted by Format(). if ( !mbValidSize ) { - // #125452# // invalidate printing area flag, if the following conditions are hold: // - current frame width is 0. // - current printing area width is 0. @@ -1664,7 +1663,6 @@ void SwContentFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/) LOOPING_LOUIE_LIGHT( bMovedFwd && bMovedBwd && !IsInBalancedSection() && ( - // #118572# ( bFootnote && !FindFootnoteFrm()->GetRef()->IsInSct() ) || // #i33887# diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index fdf9ca38fc9e..53d86fbdd3cf 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -123,7 +123,6 @@ const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFootnoteForSectio //a SectionFrm or a TabFrm. const SwLayoutFrm *pLayLeaf = this; - // #130797# const bool bNoFootnote = IsSctFrm() && !_bInvestigateFootnoteForSections; do { @@ -358,7 +357,6 @@ const SwLayoutFrm *SwFrm::ImplGetNextLayoutLeaf( bool bFwd ) const const SwContentFrm* SwContentFrm::ImplGetNextContentFrm( bool bFwd ) const { const SwFrm *pFrm = this; - // #100926# const SwContentFrm *pContentFrm = 0; bool bGoingUp = false; do { @@ -1001,7 +999,6 @@ SwContentFrm* SwFrm::_FindPrevCnt( const bool _bInSameFootnote ) SwFootnoteFrm* pMasterFootnoteFrmOfCurr( const_cast<SwFootnoteFrm*>(pFootnoteFrmOfCurr) ); pPrevContentFrm = 0L; - // #146872# // correct wrong loop-condition do { pMasterFootnoteFrmOfCurr = pMasterFootnoteFrmOfCurr->GetMaster(); diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index d26e7c04a3ce..c78bc280a23a 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -200,7 +200,6 @@ bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep if( 0 != (pNxt = m_rThis.FindNextCnt()) && (!m_pFollow || pNxt != &m_pFollow->GetFrm())) { - // #135914# // The last row of a table only keeps with the next content // it they are in the same section: if ( bCheckIfLastRowShouldKeep ) diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 66b664365cc2..a30bfe5bb17a 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -175,7 +175,6 @@ void SwFlyInCntFrm::MakeObjPos() } } -// #115759# void SwFlyInCntFrm::_ActionOnInvalidation( const InvalidationType _nInvalid ) { if ( INVALID_POS == _nInvalid || INVALID_ALL == _nInvalid ) diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index ecb637cfdf52..3a5def1fdc3b 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -263,7 +263,6 @@ SwFrmNotify::~SwFrmNotify() bool bNotifySize = false; SwAnchoredObject* pObj = rObjs[i]; SwContact* pContact = ::GetUserCall( pObj->GetDrawObj() ); - // #115759# const bool bAnchoredAsChar = pContact->ObjAnchoredAsChar(); if ( !bAnchoredAsChar ) { @@ -3320,7 +3319,6 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod, sal_uInt1 pTmpFrm->Calc(pLayout ? pLayout->GetCurrShell()->GetOut() : 0); } - // #127369# // aIter.IsChanged checks if the current pTmpFrm has been deleted while // it is the current iterator // FrmHolder watches for deletion of the current pMinFrm diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 085b7aa81312..ae0a5125f8d1 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2172,7 +2172,6 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewShellImp *pI ) : SwRect aTmp( rSh.VisArea() ); rSh.UISizeNotify(); - // #137134# // Are we supposed to crash if rSh isn't a cursor shell?! // bActions |= aTmp != rSh.VisArea() || // aBools[nBoolIdx] != ((SwCrsrShell*)&rSh)->GetCharRect().IsOver( rSh.VisArea() ); diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx index b7edff26c717..306ccf572cd8 100644 --- a/sw/source/core/layout/objectformatterlayfrm.cxx +++ b/sw/source/core/layout/objectformatterlayfrm.cxx @@ -22,7 +22,6 @@ #include <sortedobjs.hxx> #include <pagefrm.hxx> -// #124218# #include <layact.hxx> SwObjectFormatterLayFrm::SwObjectFormatterLayFrm( SwLayoutFrm& _rAnchorLayFrm, diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index a82518b440b5..aa53e362fd88 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -119,7 +119,7 @@ void SwPageDesc::Mirror() aSet.Put( m_Master.makeBackgroundBrushItem() ); aSet.Put( m_Master.GetShadow() ); aSet.Put( m_Master.GetCol() ); - aSet.Put( m_Master.GetFrmDir() ); // #112217# + aSet.Put( m_Master.GetFrmDir() ); m_Left.SetFormatAttr( aSet ); } diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 9e5ed69fedc8..ddd92e97b992 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -303,7 +303,6 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) // Add to the tree SwSectionFrm* pSect = pParent->FindSctFrm(); - // #156927# // Assure that parent is not inside a table frame, which is inside the found section frame. if ( pSect ) { @@ -544,7 +543,6 @@ static SwContentFrm* lcl_GetNextContentFrm( const SwLayoutFrm* pLay, bool bFwd ) return const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pLay->GetPrev())); } - // #100926# const SwFrm* pFrm = pLay; SwContentFrm *pContentFrm = 0; bool bGoingUp = true; diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 28ad96cbbf78..318bb3a496f2 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -1778,7 +1778,6 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) // table rows. bool bTryToSplit = true; - // #131283# // Indicates that two individual rows may keep together, based on the keep // attribute set at the first paragraph in the first cell. const bool bTableRowKeep = !bDontSplit && GetFormat()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP); @@ -2337,7 +2336,6 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) RemoveFollowFlowLine(); } - // #119477# // If splitting the table was successful or not, // we do not want to have 'empty' follow tables. if ( GetFollow() && !GetFollow()->GetFirstNonHeadlineRow() ) @@ -3338,7 +3336,6 @@ bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool &rReformat ) } SwTwips nTmpHeight = CalcHeightOfFirstContentLine(); - // #118840# // For some mysterious reason, I changed the good old // 'return nHeight <= nSpace' to 'return nTmpHeight < nSpace'. // This obviously results in problems with table frames in @@ -4553,7 +4550,6 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva ) // a follow table and table frame isn't in its // rebuild of last line. const SwTabFrm* pTabFrm = pLay->FindTabFrm(); - // #115759# // - save: check, if table frame is found. if ( pTabFrm && !( pTabFrm->IsFollow() && @@ -5337,7 +5333,6 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const } } - // #118411# // Optimization: lcl_CalcHeightOfFirstContentLine actually can trigger // a formatting of the row frame (via the GetFormatted()). We don't // want this formatting if the row does not have a height. diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx index 46ed5f73220e..b2ee9e05b788 100644 --- a/sw/source/core/swg/SwXMLBlockExport.cxx +++ b/sw/source/core/swg/SwXMLBlockExport.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -// #110680# SwXMLBlockListExport::SwXMLBlockListExport( const uno::Reference< uno::XComponentContext >& rContext, SwXMLTextBlocks & rBlocks, @@ -77,7 +76,6 @@ sal_uInt32 SwXMLBlockListExport::exportDoc(enum XMLTokenEnum ) return 0; } -// #110680# SwXMLTextBlockExport::SwXMLTextBlockExport( const uno::Reference< uno::XComponentContext >& rContext, SwXMLTextBlocks & rBlocks, diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx index 33102ea0716d..c0dbb802a9e1 100644 --- a/sw/source/core/swg/SwXMLSectionList.cxx +++ b/sw/source/core/swg/SwXMLSectionList.cxx @@ -30,7 +30,6 @@ using namespace ::xmloff::token; sal_Char const sXML_np__office[] = "_ooffice"; sal_Char const sXML_np__text[] = "_otext"; -// #110680# SwXMLSectionList::SwXMLSectionList( const uno::Reference< uno::XComponentContext >& rContext, std::vector<OUString*> &rNewSectionList) diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 0b43c8d00edb..7a24c663ca97 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -367,7 +367,6 @@ void SwTextFly::CtorInitTextFly( const SwTextFrm *pFrm ) { mbIgnoreCurrentFrame = false; mbIgnoreContour = false; - // #118809# mbIgnoreObjsInHeaderFooter = false; pPage = pFrm->FindPageFrm(); const SwFlyFrm* pTmp = pFrm->FindFlyFrm(); @@ -796,7 +795,6 @@ bool SwTextFly::GetTop( const SwAnchoredObject* _pAnchoredObj, pTmp = GetVirtualUpper( pTmp, aPos ); } // #i26945# - // #115759# // If <pTmp> is a text frame inside a table, take the upper // of the anchor frame, which contains the anchor position. else if ( pTmp->IsTextFrm() && pTmp->IsInTab() ) diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index 67db7831fba0..bcc08766dd00 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -254,7 +254,6 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto if ( bAuto ) { if ( SVX_TAB_ADJUST_DECIMAL == eAdj && - // #127428# 1 == aLineInf.NumberOfTabStops() ) pTabPor = new SwAutoTabDecimalPortion( nNewTabPos, cDec, cFill ); } diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 7ec67802ab31..e1e15b540bb2 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -155,7 +155,6 @@ void SwFormatField::RegisterToFieldType( SwFieldType& rType ) rType.Add(this); } -// #111840# void SwFormatField::SetField(SwField * _pField) { delete mpField; diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 165eb37c886e..bc0fa90bd567 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -480,7 +480,6 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo ) sal_Int32 nOldPos = nPos; nMaxPos = nMaxPos + nPos; - // #107816# // Look if the length of the original text and the ToUpper-converted // text is different. If yes, do special handling. OUString aNewText; diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 659e829edc8e..934697f4ab4a 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -120,7 +120,6 @@ SwTextNode *SwNodes::MakeTextNode( const SwNodeIndex & rWhere, SwNodeIndex aIdx( *pNode ); - // #125329# // call method <UpdateOutlineNode(..)> only for the document nodes array if ( IsDocNodes() ) UpdateOutlineNode(*pNode); @@ -2577,7 +2576,7 @@ SwTextNode* SwTextNode::_MakeNewTextNode( const SwNodeIndex& rPos, bool bNext, delete pNewAttrSet; const SwNumRule* pRule = GetNumRule(); - if( pRule && pRule == pNode->GetNumRule() && rNds.IsDocNodes() ) // #115901# + if( pRule && pRule == pNode->GetNumRule() && rNds.IsDocNodes() ) { // #i55459# // - correction: parameter <bNext> has to be checked, as it was in the diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index c29760898b31..0b8a3c2d0bc5 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1094,7 +1094,6 @@ Size SwSubFont::_GetTextSize( SwDrawTextInfo& rInf ) if(bCaseMapLengthDiffers && rInf.GetLen()) { - // #108203# // If the length of the original string and the CaseMapped one // are different, it is necessary to handle the given text part as // a single snippet since its size may differ, too. @@ -1209,7 +1208,6 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const bool bGrey ) if(bCaseMapLengthDiffers && rInf.GetLen()) { - // #108203# // If the length of the original string and the CaseMapped one // are different, it is necessary to handle the given text part as // a single snippet since its size may differ, too. diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx index c55eb68139a4..6473547ff17f 100644 --- a/sw/source/core/undo/SwUndoPageDesc.cxx +++ b/sw/source/core/undo/SwUndoPageDesc.cxx @@ -363,7 +363,6 @@ SwRewriter SwUndoPageDesc::GetRewriter() const return aResult; } -// #116530# SwUndoPageDescCreate::SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * _pDoc) : SwUndo(UNDO_CREATE_PAGEDESC), pDesc(pNew), aNew(*pNew, _pDoc), @@ -378,13 +377,11 @@ SwUndoPageDescCreate::~SwUndoPageDescCreate() void SwUndoPageDescCreate::UndoImpl(::sw::UndoRedoContext &) { - // -> #116530# if (pDesc) { aNew = *pDesc; pDesc = NULL; } - // <- #116530# pDoc->DelPageDesc(aNew.GetName(), true); } @@ -392,7 +389,7 @@ void SwUndoPageDescCreate::UndoImpl(::sw::UndoRedoContext &) void SwUndoPageDescCreate::DoImpl() { SwPageDesc aPageDesc = aNew; - pDoc->MakePageDesc(aNew.GetName(), &aPageDesc, false, true); // #116530# + pDoc->MakePageDesc(aNew.GetName(), &aPageDesc, false, true); } void SwUndoPageDescCreate::RedoImpl(::sw::UndoRedoContext &) @@ -432,12 +429,12 @@ SwUndoPageDescDelete::~SwUndoPageDescDelete() void SwUndoPageDescDelete::UndoImpl(::sw::UndoRedoContext &) { SwPageDesc aPageDesc = aOld; - pDoc->MakePageDesc(aOld.GetName(), &aPageDesc, false, true); // #116530# + pDoc->MakePageDesc(aOld.GetName(), &aPageDesc, false, true); } void SwUndoPageDescDelete::DoImpl() { - pDoc->DelPageDesc(aOld.GetName(), true); // #116530# + pDoc->DelPageDesc(aOld.GetName(), true); } void SwUndoPageDescDelete::RedoImpl(::sw::UndoRedoContext &) diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc index f258063057dc..4d9ac054533c 100644 --- a/sw/source/core/undo/undo.hrc +++ b/sw/source/core/undo/undo.hrc @@ -110,15 +110,13 @@ #define STR_UNDO_COMPAREDOC (CORE_REPEAT_END +38) #define STR_UNDO_SETFLYFRMFMT (CORE_REPEAT_END +39) #define STR_UNDO_SETRUBYATTR (CORE_REPEAT_END +40) -// #102505# #define STR_UNDO_TMPAUTOCORR (CORE_REPEAT_END +41) - #define STR_TOXCHANGE (CORE_REPEAT_END +42) #define STR_UNDO_PAGEDESC_CREATE (CORE_REPEAT_END +43) #define STR_UNDO_PAGEDESC (CORE_REPEAT_END +44) #define STR_UNDO_PAGEDESC_DELETE (CORE_REPEAT_END +45) #define STR_UNDO_HEADER_FOOTER (CORE_REPEAT_END +46) // #i7983# -#define STR_UNDO_FIELD (CORE_REPEAT_END +47) // #111840# +#define STR_UNDO_FIELD (CORE_REPEAT_END +47) #define STR_UNDO_TXTFMTCOL_CREATE (CORE_REPEAT_END +48) #define STR_UNDO_TXTFMTCOL_DELETE (CORE_REPEAT_END +49) #define STR_UNDO_TXTFMTCOL_RENAME (CORE_REPEAT_END +50) diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src index f2f969b3c1e2..90b2038ceab5 100644 --- a/sw/source/core/undo/undo.src +++ b/sw/source/core/undo/undo.src @@ -390,7 +390,6 @@ String STR_UNDO_SETRUBYATTR { Text [ en-US ] = "Ruby Setting"; }; -// #102505# String STR_UNDO_TMPAUTOCORR { Text [ en-US ] = "AutoCorrect" ; diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index cfa249aa06f0..e4d18ce70d25 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -1098,7 +1098,6 @@ bool SwUndo::CanRedlineGroup( SwRedlineSaveDatas& rCurr, return true; } -// #111827# OUString ShortenString(const OUString & rStr, sal_Int32 nLength, const OUString & rFillStr) { assert(nLength - rFillStr.getLength() >= 2); diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 933df1518edc..5dd9949910ba 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -335,7 +335,6 @@ void SwUndoInsLayFormat::RepeatImpl(::sw::RepeatContext & rContext) (void) pFlyFormat; } -// #111827# OUString SwUndoInsLayFormat::GetComment() const { OUString aResult; diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 1fda3b988566..313d2a49d6a8 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -106,7 +106,6 @@ void SwUndoInsert::Init(const SwNodeIndex & rNd) bCacheComment = false; } -// #111827# SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt, sal_Int32 nL, const SwInsertFlags nInsertFlags, @@ -120,7 +119,6 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt, Init(rNd); } -// #111827# SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd ) : SwUndo(UNDO_SPLITNODE), pText( 0 ), pRedlData( 0 ), nNode( rNd.GetIndex() ), nContent(0), nLen(1), @@ -452,7 +450,6 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext) } } -// #111827# SwRewriter SwUndoInsert::GetRewriter() const { SwRewriter aResult; @@ -580,7 +577,6 @@ MakeUndoReplaceRewriter(sal_uLong const occurrences, return aResult; } -// #111827# SwRewriter SwUndoReplace::GetRewriter() const { return MakeUndoReplaceRewriter(1, m_pImpl->GetOld(), m_pImpl->GetIns()); @@ -1012,7 +1008,6 @@ void SwUndoInsertLabel::RepeatImpl(::sw::RepeatContext & rContext) } } -// #111827# SwRewriter SwUndoInsertLabel::GetRewriter() const { return CreateRewriter(sText); diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index 6cd854ca2c67..4758876fcbe3 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -285,7 +285,6 @@ void SwUndoNumUpDown::RepeatImpl(::sw::RepeatContext & rContext) rContext.GetDoc().NumUpDown(rContext.GetRepeatPaM(), 1 == nOffset); } -// #115901# SwUndoNumOrNoNum::SwUndoNumOrNoNum( const SwNodeIndex& rIdx, bool bOldNum, bool bNewNum) : SwUndo( UNDO_NUMORNONUM ), nIdx( rIdx.GetIndex() ), mbNewNum(bNewNum), @@ -317,7 +316,6 @@ void SwUndoNumOrNoNum::RedoImpl(::sw::UndoRedoContext & rContext) } } -// #115901# void SwUndoNumOrNoNum::RepeatImpl(::sw::RepeatContext & rContext) { SwDoc & rDoc = rContext.GetDoc(); diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index 93172620ea89..3a233d98d4c5 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -130,7 +130,7 @@ void SwViewShellImp::PaintLayer( const SdrLayerID _nLayerID, GetDrawView()->GetModel()->GetDrawOutliner().SetDefaultHorizontalTextDirection( aEEHoriTextDirOfPage ); } - pOutDev->Push( PushFlags::LINECOLOR ); // #114231# + pOutDev->Push( PushFlags::LINECOLOR ); if (pPrintData) { // hide drawings but not form controls (form controls are handled elsewhere) diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 3da8f9e387e0..6d02ea30868f 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1989,7 +1989,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) if( 3 == nRet ) aFillText = aText; - else if ((4 == nRet) || (2 == nRet)) //#109414# + else if ((4 == nRet) || (2 == nRet)) aFillText = "\t"; else aFillText.clear(); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 5801208958d8..66eaeda96a46 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -337,7 +337,6 @@ short SwOutlineTabDialog::Ok() // set levels for all created templates; has to be done in order to // delete possibly cancelled assignments again. - // #130443# // encapsulate changes into a action to avoid effects on the current cursor // position during the changes. rWrtSh.StartAction(); @@ -1007,7 +1006,6 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle pVDev->SetFont(aStdFont); if(pActNum->IsContinusNum()) aNumVector[nLevel] = nPreNum; - // #128041# OUString aText(pActNum->MakeNumString( aNumVector )); pVDev->DrawText( Point(nNumberXPos, nYStart), aText ); nBulletWidth = pVDev->GetTextWidth(aText); @@ -1100,7 +1098,6 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle pVDev->SetFont(aStdFont); if (pActNum->IsContinusNum()) aNumVector[nLevel] = nPreNum; - // #128041# OUString aText(pActNum->MakeNumString( aNumVector )); pVDev->DrawText( Point(nXStart, nYStart), aText ); nTextOffset = pVDev->GetTextWidth(aText) + nXStep; diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 5e66db718a73..3ad6f9c3a988 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -1362,7 +1362,7 @@ bool SwFieldMgr::InsertField( void SwFieldMgr::UpdateCurField(sal_uLong nFormat, const OUString& rPar1, const OUString& rPar2, - SwField * _pTmpField) // #111840# + SwField * _pTmpField) { // change format OSL_ENSURE(pCurField, "no field at CursorPos"); diff --git a/sw/source/uibase/inc/conrect.hxx b/sw/source/uibase/inc/conrect.hxx index 11ffecd024b8..c79753ad16b9 100644 --- a/sw/source/uibase/inc/conrect.hxx +++ b/sw/source/uibase/inc/conrect.hxx @@ -28,7 +28,6 @@ class ConstRectangle : public SwDrawBase bool bMarquee; bool bCapVertical; - // #93382# bool mbVertical; public: diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 2f34a84300aa..fe4f06c90cb1 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -133,7 +133,7 @@ public: void UpdateCurField(sal_uLong nFormat, const OUString& rPar1, const OUString& rPar2, - SwField * _pField = 0); // #111840# + SwField * _pField = 0); OUString GetCurFieldPar1() const { return aCurPar1; } OUString GetCurFieldPar2() const { return aCurPar2; } diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 18b49fafee90..b018074f9684 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -668,7 +668,6 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) aTmp += "."; } - // #111827# SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, m_pSh->GetCrsrDescr()); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index fadf770aa2e4..adc80f534b63 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -815,7 +815,6 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept ) SwWait aWait( *pSh->GetView().GetDocShell(), true ); pSh->StartAction(); - // #111827# if (aRedlines.size() > 1) { OUString aTmpStr; @@ -848,7 +847,6 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept ) (pSh->*FnAccRej)( nPosition ); } - // #111827# if (aRedlines.size() > 1) { pSh->EndUndo(); diff --git a/sw/source/uibase/ribbar/conrect.cxx b/sw/source/uibase/ribbar/conrect.cxx index 841e9ebb0b19..b042cf46dee7 100644 --- a/sw/source/uibase/ribbar/conrect.cxx +++ b/sw/source/uibase/ribbar/conrect.cxx @@ -41,7 +41,6 @@ ConstRectangle::ConstRectangle( SwWrtShell* pWrtShell, SwEditWin* pEditWin, : SwDrawBase( pWrtShell, pEditWin, pSwView ) , bMarquee(false) , bCapVertical(false) - // #93382# , mbVertical(false) { } diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index 78ad21e2b3f0..a48e970561ed 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -87,7 +87,7 @@ enum SwDocumentSettingsPropertyHandles HANDLE_IS_LABEL_DOC, HANDLE_IS_ADD_FLY_OFFSET, HANDLE_IS_ADD_EXTERNAL_LEADING, - HANDLE_OLD_NUMBERING, // #111955# + HANDLE_OLD_NUMBERING, HANDLE_OUTLINELEVEL_YIELDS_NUMBERING, /* Stampit It disable the print cancel button of the shown progress dialog. */ HANDLE_ALLOW_PRINTJOB_CANCEL, @@ -111,7 +111,6 @@ enum SwDocumentSettingsPropertyHandles HANDLE_TABS_RELATIVE_TO_INDENT, HANDLE_RSID, HANDLE_RSID_ROOT, - // #i89181# HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, HANDLE_MODIFYPASSWORDINFO, HANDLE_MATH_BASELINE_ALIGNMENT, @@ -161,7 +160,7 @@ static MasterPropertySetInfo * lcl_createSettingsInfo() { OUString("IsLabelDocument"), HANDLE_IS_LABEL_DOC, cppu::UnoType<bool>::get(), 0, 0}, { OUString("AddFrameOffsets"), HANDLE_IS_ADD_FLY_OFFSET, cppu::UnoType<bool>::get(), 0, 0}, { OUString("AddExternalLeading"), HANDLE_IS_ADD_EXTERNAL_LEADING, cppu::UnoType<bool>::get(), 0, 0}, - { OUString("UseOldNumbering"), HANDLE_OLD_NUMBERING, cppu::UnoType<bool>::get(), 0, 0}, // #111955# + { OUString("UseOldNumbering"), HANDLE_OLD_NUMBERING, cppu::UnoType<bool>::get(), 0, 0}, { OUString("OutlineLevelYieldsNumbering"), HANDLE_OUTLINELEVEL_YIELDS_NUMBERING, cppu::UnoType<bool>::get(), 0, 0}, /* Stampit It disable the print cancel button of the shown progress dialog. */ { OUString("AllowPrintJobCancel"), HANDLE_ALLOW_PRINTJOB_CANCEL, cppu::UnoType<bool>::get(), 0, 0}, @@ -185,7 +184,6 @@ static MasterPropertySetInfo * lcl_createSettingsInfo() { OUString("Rsid"), HANDLE_RSID, cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("RsidRoot"), HANDLE_RSID_ROOT, cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("ProtectForm"), HANDLE_PROTECT_FORM, cppu::UnoType<bool>::get(), 0, 0}, - // #i89181# { OUString("TabAtLeftIndentForParagraphsInList"), HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, cppu::UnoType<bool>::get(), 0, 0}, { OUString("ModifyPasswordInfo"), HANDLE_MODIFYPASSWORDINFO, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), 0, 0}, { OUString("MathBaselineAlignment"), HANDLE_MATH_BASELINE_ALIGNMENT, cppu::UnoType<bool>::get(), 0, 0}, @@ -561,7 +559,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::ADD_EXT_LEADING, bTmp); } break; - case HANDLE_OLD_NUMBERING: // #111955# + case HANDLE_OLD_NUMBERING: { bool bTmp = *static_cast<sal_Bool const *>(rValue.getValue()); mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::OLD_NUMBERING, bTmp); @@ -708,7 +706,6 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::PROTECT_FORM, bTmp); } break; - // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { bool bTmp = *static_cast<sal_Bool const *>(rValue.getValue()); @@ -1029,12 +1026,12 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::ADD_EXT_LEADING); } break; - case HANDLE_OLD_NUMBERING: // #111955# + case HANDLE_OLD_NUMBERING: { rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::OLD_NUMBERING); } break; - case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING: // #111955# + case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING: { rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE); } @@ -1144,7 +1141,6 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::PROTECT_FORM); } break; - // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST); diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index 36cde06faa6f..d6dd03a8eb69 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -21,7 +21,6 @@ #include <crsskip.hxx> #include <swcrsr.hxx> #include <editeng/lrspitem.hxx> -// #134369# #include <view.hxx> #include <drawbase.hxx> @@ -359,10 +358,8 @@ long SwWrtShell::DelRight() LeaveSelFrmMode(); UnSelectFrm(); - // #134369# OSL_ENSURE( !IsFrmSelected(), "<SwWrtShell::DelRight(..)> - <SwWrtShell::UnSelectFrm()> should unmark all objects" ); - // #134369# // leave draw mode, if necessary. { if (GetView().GetDrawFuncPtr()) @@ -377,7 +374,6 @@ long SwWrtShell::DelRight() } } - // #134369# // <IsFrmSelected()> can't be true - see above. { nSelection = GetSelectionType(); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index c0cc481d6478..719e23730eff 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -207,7 +207,6 @@ void SwWrtShell::Insert( const OUString &rStr ) // insert is already in parentheses at Editshell. StartAllAction(); - // #111827# SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, GetCrsrDescr()); diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 866fef255f65..091e6e2e9b24 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -706,7 +706,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) if ( mpImpl->getMouseMotionListeners().getLength() && !pMouseEvt->IsEnterWindow() && !pMouseEvt->IsLeaveWindow() ) { awt::MouseEvent aEvent( VCLUnoHelper::createMouseEvent( *pMouseEvt, *this ) ); - aEvent.ClickCount = 0; // #92138# + aEvent.ClickCount = 0; if ( pMouseEvt->GetMode() & MouseEventModifiers::SIMPLEMOVE ) mpImpl->getMouseMotionListeners().mouseMoved( aEvent ); else diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index d746e6d865ca..c1cab9c8166f 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -239,8 +239,8 @@ struct PropertySetRegistry_Impl Reference< XInterface > m_xRootReadAccess; Reference< XInterface > m_xRootWriteAccess; osl::Mutex m_aMutex; - bool m_bTriedToGetRootReadAccess; // #82494# - bool m_bTriedToGetRootWriteAccess; // #82494# + bool m_bTriedToGetRootReadAccess; + bool m_bTriedToGetRootWriteAccess; explicit PropertySetRegistry_Impl(const Sequence<Any> &rInitArgs) : m_aInitArgs(rInitArgs) @@ -965,7 +965,7 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess() if ( !m_pImpl->m_xRootReadAccess.is() ) { - if ( m_pImpl->m_bTriedToGetRootReadAccess ) // #82494# + if ( m_pImpl->m_bTriedToGetRootReadAccess ) { OSL_FAIL( "PropertySetRegistry::getRootConfigReadAccess - " "Unable to read any config data! -> #82494#" ); @@ -1023,7 +1023,7 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess( if ( !m_pImpl->m_xRootWriteAccess.is() ) { - if ( m_pImpl->m_bTriedToGetRootWriteAccess ) // #82494# + if ( m_pImpl->m_bTriedToGetRootWriteAccess ) { OSL_FAIL( "PropertySetRegistry::getConfigWriteAccess - " "Unable to write any config data! -> #82494#" ); diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index bd9805c1b557..2e73447251fd 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -1035,7 +1035,7 @@ HierarchyEntry::getRootReadAccess() osl::Guard< osl::Mutex > aGuard( m_aMutex ); if ( !m_xRootReadAccess.is() ) { - if ( m_bTriedToGetRootReadAccess ) // #82494# + if ( m_bTriedToGetRootReadAccess ) { OSL_FAIL( "HierarchyEntry::getRootReadAccess - " "Unable to read any config data! -> #82494#" ); diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx index 15fe58df6d3f..a9eb1a705106 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx @@ -91,7 +91,7 @@ class HierarchyEntry ::com::sun::star::uno::Reference< ::com::sun::star::util::XOfficeInstallationDirectories > m_xOfficeInstDirs; - bool m_bTriedToGetRootReadAccess; // #82494# + bool m_bTriedToGetRootReadAccess; private: static OUString createPathFromHierarchyURL( const HierarchyUri & rURI ); diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index ac68a59590e9..18dd8f0bcd98 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -224,7 +224,7 @@ HierarchyContentProvider::getRootConfigReadNameAccess( { if ( !( (*it).second.xRootReadAccess.is() ) ) { - if ( (*it).second.bTriedToGetRootReadAccess ) // #82494# + if ( (*it).second.bTriedToGetRootReadAccess ) { OSL_FAIL( "HierarchyContentProvider::getRootConfigReadNameAccess - " "Unable to read any config data! -> #82494#" ); diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index 494e11a3b105..973ff75957db 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -52,7 +52,7 @@ struct ConfigProviderMapEntry com::sun::star::lang::XMultiServiceFactory > xConfigProvider; com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xRootReadAccess; - bool bTriedToGetRootReadAccess; // #82494# + bool bTriedToGetRootReadAccess; ConfigProviderMapEntry() : bTriedToGetRootReadAccess( false ) {} }; diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 6f5ee4b6acb8..bb4e317484a8 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -1954,7 +1954,6 @@ uno::Any Content::open( OUStringBuffer aMsg; if ( getResourceType( xEnv ) == FTP ) { - // #114653# aMsg.append( "FTP over HTTP proxy: resource cannot " "be opened as folder! Wrong Open Mode!" ); } diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 080bb8284bf3..95739db86333 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -572,7 +572,7 @@ void ServerFont::SetFontOptions(std::shared_ptr<ImplFontOptions> xFontOptions) if( (mnSin != 0) && (mnCos != 0) ) // hinting for 0/90/180/270 degrees only mnLoadFlags |= FT_LOAD_NO_HINTING; - mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; //#88334# + mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; if (mxFontOptions->DontUseAntiAlias()) mnPrioAntiAlias = 0; diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 1fdf3879a6e6..56d64cb1e3e9 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -891,7 +891,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) DeselectAll(); mnCurrentPos = LISTBOX_ENTRY_NOTFOUND; SetTopEntry( 0 ); - if ( mbStackMode ) // #87072#, #92323# + if ( mbStackMode ) { mbTravelSelect = true; mnSelectModifier = rMEvt.GetModifier(); @@ -923,7 +923,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) mbTrackingSelect = true; if ( SelectEntries( nSelect, LET_TRACKING, false, false ) ) { - if ( mbStackMode ) // #87072# + if ( mbStackMode ) { mbTravelSelect = true; mnSelectModifier = rMEvt.GetModifier(); @@ -1266,7 +1266,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) mbTrackingSelect = true; if ( SelectEntries( nSelect, LET_TRACKING, bShift, bCtrl ) ) { - if ( mbStackMode ) // #87734# (#87072#) + if ( mbStackMode ) { mbTravelSelect = true; mnSelectModifier = rTEvt.GetMouseEvent().GetModifier(); diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 49f3b65eeaae..f9b86cd211f5 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -884,7 +884,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r else aGraphic = rGraphic; - sal_Int32 nColors = rConfigItem.ReadInt32( "Color", 0 ); // #92767# + sal_Int32 nColors = rConfigItem.ReadInt32( "Color", 0 ); if ( nColors ) // graphic conversion necessary ? { BitmapEx aBmpEx( aGraphic.GetBitmapEx() ); diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 24629d5f9b0e..47679f6dc39a 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -722,7 +722,7 @@ bool EnhWMFReader::ReadEnhWMF() break; case EMR_SETWINDOWEXTEX : - { // #75383# + { pWMF->ReadUInt32( nW ).ReadUInt32( nH ); pOut->SetWinExt( Size( nW, nH ), true); } @@ -764,7 +764,7 @@ bool EnhWMFReader::ReadEnhWMF() break; case EMR_EOF : - nRecordCount = 0; // #76846# + nRecordCount = 0; break; case EMR_SETPIXELV : diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index f0a248ddae31..c81e6f305892 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -2207,7 +2207,6 @@ void OutputDevice::DrawCtrlText( const Point& rPos, const OUString& rStr, if( nMnemonicPos >= nLen ) { - // #106952# // may occur in BiDi-Strings: the '~' is sometimes found behind the last char // due to some strange BiDi text editors // -> place the underline behind the string to indicate a failure diff --git a/xmloff/inc/MetaImportComponent.hxx b/xmloff/inc/MetaImportComponent.hxx index 7738f044d849..fa20849a8d2b 100644 --- a/xmloff/inc/MetaImportComponent.hxx +++ b/xmloff/inc/MetaImportComponent.hxx @@ -33,7 +33,6 @@ private: ::com::sun::star::document::XDocumentProperties> mxDocProps; public: - // #110680# // XMLMetaImportComponent() throw(); XMLMetaImportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx index 41e179de4cad..dc07b786596b 100644 --- a/xmloff/inc/SchXMLExport.hxx +++ b/xmloff/inc/SchXMLExport.hxx @@ -50,7 +50,6 @@ protected: virtual void _ExportContent() SAL_OVERRIDE; public: - // #110680# SchXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx index 01e6e1d46893..648db1a0d304 100644 --- a/xmloff/inc/SchXMLImport.hxx +++ b/xmloff/inc/SchXMLImport.hxx @@ -169,7 +169,6 @@ protected: const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; public: - // #110680# SchXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLImportFlags nImportFlags ); diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx index 046df42ff448..0c6fba36f7a7 100644 --- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx +++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx @@ -34,14 +34,12 @@ class XMLEmbeddedObjectImportContext : public SvXMLImportContext ::com::sun::star::lang::XComponent > xComp; OUString sFilterService; - // #100592# OUString sCLSID; public: TYPEINFO_OVERRIDE(); const OUString& GetFilterServiceName() const { return sFilterService; } - // #100592# const OUString& GetFilterCLSID() const { return sCLSID; } XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 4e034c7ba40f..568e3e938c74 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -3755,7 +3755,6 @@ OUString SAL_CALL SchXMLExport_getImplementationName() throw() Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) { - // #110680# // #103997# removed some flags from EXPORT_ALL return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_getImplementationName(), SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS ))); } @@ -3797,7 +3796,6 @@ OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw() Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const Reference< lang::XMultiServiceFactory >& rSMgr) throw( uno::Exception ) { - // #110680# return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Styles_getImplementationName(), SvXMLExportFlags::STYLES )); } @@ -3833,7 +3831,6 @@ OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw() Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) { - // #110680# return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS )); } diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index a8e1ea4a81e4..40a4608d8704 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -502,7 +502,6 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries( return xResult; } -// #110680# SchXMLImport::SchXMLImport( const Reference< uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLImportFlags nImportFlags ) : @@ -671,7 +670,6 @@ OUString SAL_CALL SchXMLImport_getImplementationName() throw() Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) { - // #110680# return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_getImplementationName(), SvXMLImportFlags::ALL)); } @@ -691,7 +689,6 @@ OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw() Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) { - // #110680# return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES )); } @@ -709,7 +706,6 @@ OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw() Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) { - // #110680# return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Content_getImplementationName(), SvXMLImportFlags::CONTENT | SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::FONTDECLS )); } @@ -727,7 +723,6 @@ OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw() Reference< uno::XInterface > SAL_CALL SchXMLImport_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) { - // #110680# return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META )); } diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 5e4abe4fc7ee..b778bfa35b64 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -388,7 +388,6 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI maPresRect.SetSize(aLayoutSize); } -// #110680# SdXMLExport::SdXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, @@ -1739,7 +1738,6 @@ void SdXMLExport::SetProgress(sal_Int32 nProg) GetStatusIndicator()->setValue(nProg); } -// #82003# void SdXMLExport::_ExportMeta() { diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index d8311e1c591f..30ea0952d715 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -122,7 +122,6 @@ class SdXMLExport : public SvXMLExport virtual void _ExportFontDecls() SAL_OVERRIDE; virtual void _ExportMasterStyles() SAL_OVERRIDE; virtual void _ExportContent() SAL_OVERRIDE; - // #82003# virtual void _ExportMeta() SAL_OVERRIDE; ImpXMLEXPPageMasterInfo* ImpGetOrCreatePageMasterInfo( com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > xMasterPage ); diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 4de2b980d23c..d161888b40e4 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -282,7 +282,6 @@ SERVICE( XMLDrawMetaImportOasis, "com.sun.star.comp.Draw.XMLOasisMetaImporter", SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", false, SvXMLImportFlags::SETTINGS ) SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", true, SvXMLImportFlags::SETTINGS ) -// #110680# SdXMLImport::SdXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 8088a5fc2756..65aeb5bcc24e 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -280,7 +280,6 @@ public: bool IsDraw() const { return mbIsDraw; } bool IsImpress() const { return !mbIsDraw; } - // #80365# virtual void SetStatistics( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE; diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 66b82273ccd4..e7d42ddb02be 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2837,7 +2837,6 @@ void XMLShapeExport::ImpExportOLE2Shape( if(bExportEmbedded && !bIsEmptyPresObj) { - // #100592# if(bInternal) { // embedded XML diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 7a050867e66a..0c9d4644f5c7 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -1109,7 +1109,6 @@ void XMLShapeImportHelper::endPage( com::sun::star::uno::Reference< com::sun::st mpPageContext = pNextContext; } -// #88546# /** defines if the import should increment the progress bar or not */ void XMLShapeImportHelper::enableHandleProgressBar( bool bEnable ) { diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 3a05256e5c90..7984878295cd 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -449,7 +449,6 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) OSL_FAIL( "SdXMLShapeContext::AddShape(), exception caught!" ); } - // #107848# if(!mbTemporaryShape && (!GetImport().HasTextImport() || !GetImport().GetTextImport()->IsInsideDeleteContext())) { @@ -2001,7 +2000,6 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUS void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { - // #107928# // For security reasons, do not add empty connectors. There may have been an error in EA2 // that created empty, far set off connectors (e.g. 63 meters below top of document). This // is not guaranteed, but it's definitely safe to not add empty connectors. @@ -2818,7 +2816,6 @@ void SdXMLObjectShapeContext::EndElement() } } - // #100592# if( mxBase64Stream.is() ) { OUString aPersistName( GetImport().ResolveEmbeddedObjectURLFromBase64() ); @@ -2862,7 +2859,6 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { - // #100592# SvXMLImportContext* pContext = NULL; if((XML_NAMESPACE_OFFICE == nPrefix) && IsXMLToken(rLocalName, XML_BINARY_DATA)) diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index fdf1e7056da3..4161694b66b1 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -448,7 +448,6 @@ private: OUString maCLSID; OUString maHref; - // #100592# ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: @@ -464,7 +463,6 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; - // #100592# virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx index 0ddd4f57b852..6ec29e387146 100644 --- a/xmloff/source/meta/MetaImportComponent.cxx +++ b/xmloff/source/meta/MetaImportComponent.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -// #110680# XMLMetaImportComponent::XMLMetaImportComponent( const uno::Reference< uno::XComponentContext >& xContext) throw() : SvXMLImport(xContext, ""), mxDocProps() @@ -91,7 +90,6 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaImportComponent_createInstance const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) { - // #110680# return static_cast<cppu::OWeakObject*>(new XMLMetaImportComponent( comphelper::getComponentContext(rSMgr))); } diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index fa316026add5..8812f8e7041b 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; const char XMLN_VERSIONSLIST[] = "VersionList.xml"; -// #110897# XMLVersionListExport::XMLVersionListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, const com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions, diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx index 08420ec92e90..8ec1685882b2 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.cxx +++ b/xmloff/source/text/XMLChangeElementImportContext.cxx @@ -82,7 +82,6 @@ SvXMLImportContext* XMLChangeElementImportContext::CreateChildContext( return pContext; } -// #107848# void XMLChangeElementImportContext::StartElement( const Reference< XAttributeList >& ) { if(bAcceptContent) @@ -91,7 +90,6 @@ void XMLChangeElementImportContext::StartElement( const Reference< XAttributeLis } } -// #107848# void XMLChangeElementImportContext::EndElement() { if(bAcceptContent) diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx index 92e9209a0f29..d6fb8333df61 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.hxx +++ b/xmloff/source/text/XMLChangeElementImportContext.hxx @@ -76,12 +76,10 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; - // #107848# // Start- and EndElement are needed here to set the inside_deleted_section // flag at the corresponding TextImportHelper virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - // #107848# virtual void EndElement() SAL_OVERRIDE; }; diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index 9129b62d28cf..108b49d55b47 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -240,7 +240,6 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(bool) { if (aServices[i].equals(sFieldMaster_Bibliography)) // here we should use a method which compares in reverse order if available - // #85282# bFound = true; else i++; diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 4368407e05a0..df621d46812c 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -770,7 +770,6 @@ void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ ) } } - // #107848# // Make adding the shape to Z-Ordering dependent from if we are // inside a inside_deleted_section (redlining). That is necessary // since the shape will be removed again later. It would lead to diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 0e014cc396f9..2374feec9f8e 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -563,7 +563,6 @@ struct XMLTextImportHelper::Impl bool m_bOrganizerMode : 1; bool m_bBodyContentStarted : 1; - // #107848# /// Are we inside a <text:deletion> element (deleted redline section) bool m_bInsideDeleteContext : 1; diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 5ef925efbda9..be7ea98a9611 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -2615,7 +2615,6 @@ XMLShapeExportFlags XMLTextParagraphExport::addTextFrameAttributes( } else { - // #92210# nShapeFeatures |= XMLShapeExportFlags::NO_WS; } |