diff options
author | Alexander O. Anisimov <alenyashka@gmail.com> | 2010-11-09 01:42:14 +0500 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-09 11:50:47 +0000 |
commit | dec234ba07197fcfde9bf4e240549ffaa3ba00b4 (patch) | |
tree | 590b035fe0575a06214b2a520887074963332a1e /svx | |
parent | 9569c88f3ba13115e6af4fca17805ef2fc8716e3 (diff) |
Clean up the code
* Remove bogus comments
* Refresh comments containing a reference to the bug tracker
* Remove the comments such as "// add by zhaojianwei"
Diffstat (limited to 'svx')
28 files changed, 58 insertions, 252 deletions
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 92547d56ac19..a2f1871ff049 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -480,7 +480,7 @@ public: virtual bool CanSdrRepeat(SdrView& rView) const; }; -// --> OD 2009-07-09 #i73249# +// Implement Title/Description Elements UI for Writer text frames, graphics and embedded objects (#i73249#) class SdrUndoObjStrAttr : public SdrUndoObj { public: @@ -507,7 +507,6 @@ public: virtual String GetComment() const; }; -// <-- //////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -852,12 +851,11 @@ public: virtual SdrUndoAction* CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ); virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ); - // --> OD 2009-07-09 #i73249# + // Implement Title/Description Elements UI for Writer text frames, graphics and embedded objects (#i73249#) virtual SdrUndoAction* CreateUndoObjectStrAttr( SdrObject& rObject, SdrUndoObjStrAttr::ObjStrAttrType eObjStrAttrType, String sOldStr, String sNewStr ); - // <-- // layer virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index ae6e8fe7246b..ab2c8b93978d 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -347,7 +347,7 @@ public: virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, const SdrView* pView, - USHORT nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog CHINA001 + USHORT nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index 6d1e5a119659..eb2ec28c544f 100755 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -745,11 +745,11 @@ //#define SID_ZOOM_PREV ( SID_SVX_START + 403 ) -> sfxsids.hrc #define SID_BACKGRND_DESTINATION ( SID_SVX_START + 404 ) #define SID_ATTR_FLASH ( SID_SVX_START + 406 ) -#define SID_ATTR_3D_LIGHT ( SID_SVX_START + 407 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ +#define SID_ATTR_3D_LIGHT ( SID_SVX_START + 407 ) /* Slots mit --> koennen demnaechst entfallen */ #define SID_ATTR_3D_START SID_ATTR_3D_LIGHT -#define SID_ATTR_3D_LIGHTINTENSITY ( SID_SVX_START + 408 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ -#define SID_ATTR_3D_LIGHTCOLOR ( SID_SVX_START + 409 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ -#define SID_ATTR_3D_AMBIENTINTENSITY ( SID_SVX_START + 410 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ +#define SID_ATTR_3D_LIGHTINTENSITY ( SID_SVX_START + 408 ) /* Slots mit --> koennen demnaechst entfallen */ +#define SID_ATTR_3D_LIGHTCOLOR ( SID_SVX_START + 409 ) /* Slots mit --> koennen demnaechst entfallen */ +#define SID_ATTR_3D_AMBIENTINTENSITY ( SID_SVX_START + 410 ) /* Slots mit --> koennen demnaechst entfallen */ #define SID_ATTR_3D_AMBIENTCOLOR ( SID_SVX_START + 411 ) #define SID_IMPORT_GRAPH_LINK ( SID_SVX_START + 412 ) diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index 12e8d52f1266..47a1c4899eb7 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -70,12 +70,11 @@ class SfxItemSet; class SdrModel; class SvxDrawPage; class SvGlobalName; -// --> OD 2009-01-16 #i59051# +// Dimension arrows change size/position on save/reload (#i59051#) namespace basegfx { class B2DPolyPolygon; } // end of namespace basegfx -// <-- class SvxShapeMutex { @@ -140,10 +139,9 @@ protected: // Umrechnungen fuer den Writer, der in TWIPS arbeitet void ForceMetricToItemPoolMetric(Pair& rPoint) const throw(); void ForceMetricTo100th_mm(Pair& rPoint) const throw(); - // --> OD 2009-01-16 #i59051# + // Dimension arrows change size/position on save/reload (#i59051#) void ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); void ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); - // <-- ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const; diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index fff5c6e82895..8d69b800be9a 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -178,7 +178,7 @@ namespace accessibility // checks all children for visibility, throws away invisible ones void UpdateVisibleChildren( bool bBroadcastEvents=true ); - // check all children for changes in positon and size + // check all children for changes in position and size void UpdateBoundRect(); // calls SetSelection on the forwarder and updates maLastSelection @@ -641,18 +641,15 @@ namespace accessibility makeSortedPair(::std::min( maLastSelection.nStartPara, nMaxValidParaIndex ), ::std::min( maLastSelection.nEndPara, nMaxValidParaIndex ) ) ); - // --> OD 2005-12-15 #i27299# - // event TEXT_SELECTION_CHANGED has to be submitted. + // event TEXT_SELECTION_CHANGED has to be submitted. (#i27299#) const sal_Int16 nTextSelChgEventId = AccessibleEventId::TEXT_SELECTION_CHANGED; - // <-- // #107037# notify selection change if( maLastSelection.nStartPara == EE_PARA_NOT_FOUND ) { // last selection is undefined - // --> OD 2005-12-15 #i27299# - use method <ESelection::HasRange()> + // use method <ESelection::HasRange()> (#i27299#) if ( aSelection.HasRange() ) - // <-- { // selection was undefined, now is on maParaManager.FireEvent( sortedSelection.first, @@ -663,36 +660,31 @@ namespace accessibility else { // last selection is valid - // --> OD 2005-12-15 #i27299# - use method <ESelection::HasRange()> + // use method <ESelection::HasRange()> (#i27299#) if ( maLastSelection.HasRange() && !aSelection.HasRange() ) - // <-- { // selection was on, now is empty maParaManager.FireEvent( sortedLastSelection.first, sortedLastSelection.second+1, nTextSelChgEventId ); } - // --> OD 2005-12-15 #i27299# - use method <ESelection::HasRange()> + // use method <ESelection::HasRange()> (#i27299#) else if( !maLastSelection.HasRange() && aSelection.HasRange() ) - // <-- { // selection was empty, now is on maParaManager.FireEvent( sortedSelection.first, sortedSelection.second+1, nTextSelChgEventId ); } - // --> OD 2005-12-15 #i27299# - // - no event TEXT_SELECTION_CHANGED event, if new and - // last selection are empty. + // no event TEXT_SELECTION_CHANGED event, if new and + // last selection are empty. (#i27299#) else if ( maLastSelection.HasRange() && aSelection.HasRange() ) - // <-- { - // --> OD 2005-12-16 #i27299# - // - send event TEXT_SELECTION_CHANGED for difference - // between last and new selection. + // send event TEXT_SELECTION_CHANGED for difference + // between last and new selection. (#i27299#) // // selection was on, now is different: take union of ranges // maParaManager.FireEvent( ::std::min(sortedSelection.first, // sortedLastSelection.second), @@ -1462,10 +1454,9 @@ namespace accessibility if( pEditSourceHint ) { maEventQueue.Append( *pEditSourceHint ); - // --> OD 2005-12-19 #i27299# + // EditEngine should emit TEXT_SELECTION_CHANGED events (#i27299#) if( maEventOpenFrames == 0 ) ProcessQueue(); - // <-- } else if( pTextHint ) { @@ -1502,17 +1493,14 @@ namespace accessibility case TEXT_HINT_BLOCKNOTIFICATION_START: case TEXT_HINT_INPUT_START: ++maEventOpenFrames; - // --> OD 2005-12-19 #i27299# - no FALLTROUGH - // reason: event will not be processes, thus appending - // the event isn't necessary. + // no FALLTHROUGH reason: event will not be processed, + // thus appending the event isn't necessary. (#i27299#) break; - // <-- default: maEventQueue.Append( *pTextHint ); - // --> OD 2005-12-19 #i27299# + // EditEngine should emit TEXT_SELECTION_CHANGED events (#i27299#) if( maEventOpenFrames == 0 ) ProcessQueue(); - // <-- break; } } diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index e3fa352976c5..6f172966a4a5 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -67,14 +67,12 @@ AccessibleShape* CreateSvxAccessibleShape ( case DRAWING_POLY_LINE_PATH: case DRAWING_RECTANGLE: case DRAWING_TEXT: - // --> OD 2004-11-29 #i37790# - default accessiblility shape for - // com::sun::star::drawing::CustomShape + // Default accessiblility shape for + // com::sun::star::drawing::CustomShape (#i37790#) case DRAWING_CUSTOM: - // <-- - // --> OD 2008-05-19 #i85429# - default accessiblility shape for - // com::sun::star::drawing::MediaShape + // Default accessiblility shape for + // com::sun::star::drawing::MediaShape (#i85429#) case DRAWING_MEDIA: - // <-- return new AccessibleShape (rShapeInfo, rShapeTreeInfo); case DRAWING_CONTROL: @@ -199,9 +197,8 @@ ShapeTypeDescriptor aSvxShapeTypeList[] = { void RegisterDrawShapeTypes (void) { - // --> OD 2004-11-26 #i37790# + // Crash while inserting callout with activated accesibility (#i37790#) ShapeTypeHandler::Instance().AddShapeTypeList ( DRAWING_END, aSvxShapeTypeList); - // <-- } diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 6cde2c265b1f..2a3493841b38 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -95,24 +95,18 @@ void SpellDialogChildWindow::AddAutoCorrection( { DBG_ERROR("AutoCorrection should have been overloaded - if available"); } -/*-- 16.06.2008 10:11:57--------------------------------------------------- - -----------------------------------------------------------------------*/ bool SpellDialogChildWindow::HasGrammarChecking() { return false; } -/*-- 18.06.2008 12:26:35--------------------------------------------------- - -----------------------------------------------------------------------*/ bool SpellDialogChildWindow::IsGrammarChecking() { DBG_ERROR("Grammar checking should have been overloaded - if available"); return false; } -/*-- 18.06.2008 12:26:35--------------------------------------------------- - -----------------------------------------------------------------------*/ void SpellDialogChildWindow::SetGrammarChecking(bool ) { DBG_ERROR("Grammar checking should have been overloaded - if available"); diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index a87e26eb61a4..3547f657e47c 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -802,23 +802,17 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) pImpl->DrawPrev( this, pPrinter, aTmpPoint, rFont ); } } -/* -----------------------------04.12.00 16:26-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SvxFontPrevWindow::IsTwoLines() const { return pImpl->bTwoLines; } -/* -----------------------------04.12.00 16:26-------------------------------- - ---------------------------------------------------------------------------*/ void SvxFontPrevWindow::SetTwoLines(BOOL bSet) { pImpl->bTwoLines = bSet;} -/* -----------------------------04.12.00 16:26-------------------------------- - ---------------------------------------------------------------------------*/ void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd) { pImpl->cStartBracket = cStart; diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index d6920a5a55fc..d7c2cb8fcc27 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -1220,9 +1220,7 @@ void SvxFontWorkDialog::DataChanged( const DataChangedEvent& rDCEvt ) SfxDockingWindow::DataChanged( rDCEvt ); } -/* -----------------------------08.05.2002 14:28------------------------------ - ---------------------------------------------------------------------------*/ void SvxFontWorkDialog::ApplyImageList() { ResMgr* _pMgr = &DIALOG_MGR(); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index f5067a3bd374..73027e192d6e 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -64,7 +64,7 @@ #include <svx/dialogs.hrc> // static ---------------------------------------------------------------- -// --> OD 2004-06-18 #i19922# +// Word 97 incompatibility (#i19922#) //static const long MINBODY = 284; // 0,5cm in twips aufgerundet static const long MINBODY = 56; // 1mm in twips rounded @@ -953,9 +953,7 @@ IMPL_LINK( SvxHFPage, RangeHdl, Edit *, EMPTYARG ) aRMEdit.SetMax( aLMEdit.Normalize( nMax ), FUNIT_TWIP ); return 0; } -/* -----------------------------26.08.2002 12:49------------------------------ - ---------------------------------------------------------------------------*/ void lcl_Move(Window& rWin, sal_Int32 nDiff) { Point aPos(rWin.GetPosPixel()); diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx index 2ab7acde4789..72c27f667f8d 100644 --- a/svx/source/dialog/hyprlink.cxx +++ b/svx/source/dialog/hyprlink.cxx @@ -68,9 +68,6 @@ public: virtual void Commit(); }; -/*-- 11.11.2003 14:20:59--------------------------------------------------- - - -----------------------------------------------------------------------*/ SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() : ConfigItem(OUString::createFromAscii("Inet/DefaultSearchEngine")) { @@ -79,9 +76,7 @@ SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() : uno::Sequence< uno::Any > aValues = GetProperties(aNames); aValues.getConstArray()[0] >>= sDefaultEngine; } -/*-- 11.11.2003 14:21:00--------------------------------------------------- - -----------------------------------------------------------------------*/ SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl() { } diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index ec67586ad2dd..ddd57cc3cf4b 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -44,9 +44,7 @@ #include "optgrid.hrc" #include "dlgutil.hxx" -/* -----------------18.08.98 17:41------------------- - * local functions - * --------------------------------------------------*/ +// local functions void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax) { nFirst = static_cast<long>(rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) )); @@ -167,11 +165,7 @@ SfxItemPresentation SvxGridItem::GetPresentation } } - -/*----------------- OS 23.02.95 ----------------------- - TabPage Rastereinstellungen --------------------------------------------------------*/ - +// TabPage Rastereinstellungen SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_GRID ), rCoreSet ), diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index a006c7d6139d..84c4ced8e42e 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -401,16 +401,12 @@ void SvxPageWindow::SetFtBorder( const SvxBoxItem& rNew ) delete pFtBorder; pFtBorder = new SvxBoxItem( rNew ); } -/* -----------------------------13.06.2002 16:16------------------------------ - ---------------------------------------------------------------------------*/ void SvxPageWindow::EnableFrameDirection(sal_Bool bEnable) { pImpl->EnableFrameDirection(bEnable); } -/* -----------------------------13.06.2002 16:16------------------------------ - ---------------------------------------------------------------------------*/ void SvxPageWindow::SetFrameDirection(sal_Int32 nFrameDirection) { pImpl->SetFrameDirection(nFrameDirection); diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index 47745d1714d4..33ef71862336 100644 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -34,9 +34,6 @@ #include <svx/dialmgr.hxx> #include <tools/shl.hxx> -/* -----------------------------01.02.00 13:57-------------------------------- - - ---------------------------------------------------------------------------*/ SvxPrtQryBox::SvxPrtQryBox(Window* pParent) : MessBox(pParent, 0, String(SVX_RES(RID_SVXSTR_QRY_PRINT_TITLE)), @@ -51,9 +48,7 @@ SvxPrtQryBox::SvxPrtQryBox(Window* pParent) : AddButton(BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON); SetButtonHelpText( RET_OK, String() ); } -/* -----------------------------01.02.00 13:57-------------------------------- - ---------------------------------------------------------------------------*/ SvxPrtQryBox::~SvxPrtQryBox() { } diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index f66c862ca32c..258d972c13dd 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -74,9 +74,7 @@ static const sal_Char cRubyIsAbove[] = "RubyIsAbove"; static const sal_Char cDisplayName[] = "DisplayName"; static const sal_Char cRubyCharStyleName[] = "RubyCharStyleName"; static const sal_Char cRubies[] = "Rubies"; -/* -----------------------------09.01.01 17:24-------------------------------- - ---------------------------------------------------------------------------*/ SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow(_pParent, nId) @@ -91,16 +89,12 @@ SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, USHORT nId, pDlg->Initialize( pInfo ); } -/* -----------------------------10.01.01 13:53-------------------------------- - ---------------------------------------------------------------------------*/ SfxChildWinInfo SvxRubyChildWindow::GetInfo() const { return SfxChildWindow::GetInfo(); } -/* -----------------------------09.01.01 17:17-------------------------------- - ---------------------------------------------------------------------------*/ class SvxRubyData_Impl : public cppu::WeakImplHelper1 < ::com::sun::star::view::XSelectionChangeListener > { @@ -277,18 +271,14 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW, UpdateColors(); } -/* -----------------------------09.01.01 17:17-------------------------------- - ---------------------------------------------------------------------------*/ SvxRubyDialog::~SvxRubyDialog() { ClearCharStyleList(); EventObject aEvent; xImpl->disposing(aEvent); } -/* -----------------------------01.02.01 10:29-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::ClearCharStyleList() { for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++) @@ -298,9 +288,7 @@ void SvxRubyDialog::ClearCharStyleList() } aCharStyleLB.Clear(); } -/* -----------------------------09.01.01 17:17-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SvxRubyDialog::Close() { pBindings->GetDispatcher()->Execute( SID_RUBY_DIALOG, @@ -308,9 +296,7 @@ BOOL SvxRubyDialog::Close() SFX_CALLMODE_RECORD); return TRUE; } -/* -----------------------------29.01.01 15:26-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::Activate() { SfxModelessDialog::Activate(); @@ -392,16 +378,12 @@ void SvxRubyDialog::Activate() aPreviewWin.Invalidate(); } } -/* -----------------------------29.01.01 15:26-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::Deactivate() { SfxModelessDialog::Deactivate(); } -/* -----------------------------30.01.01 15:35-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight) { OUString sLeft, sRight; @@ -535,17 +517,13 @@ void SvxRubyDialog::Update() ScrollHdl_Impl(&aScrollSB); } -/* -----------------------------16.02.01 14:01-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::GetCurrentText(String& rBase, String& rRuby) { rBase = aEditArr[nCurrentEdit * 2]->GetText(); rRuby = aEditArr[nCurrentEdit * 2 + 1]->GetText(); } -/* -----------------------------31.01.01 14:09-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll) { long nPos = pScroll->GetThumbPos(); @@ -561,9 +539,7 @@ IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll) aPreviewWin.Invalidate(); return 0; } -/* -----------------------------30.01.01 14:48-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG) { const Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues(); @@ -592,17 +568,13 @@ IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG) } return 0; } -/* -----------------------------29.01.01 09:38-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, CloseHdl_Impl, PushButton*, EMPTYARG) { Close(); return 0; } -/* -----------------------------29.01.01 15:10-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, StylistHdl_Impl, PushButton*, EMPTYARG) { SfxPoolItem* pState = 0; @@ -615,18 +587,14 @@ IMPL_LINK(SvxRubyDialog, StylistHdl_Impl, PushButton*, EMPTYARG) } return 0; } -/* -----------------------------30.01.01 15:32-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, AutomaticHdl_Impl, CheckBox*, pBox) { pImpl->UpdateRubyValues(pBox->IsChecked()); Update(); return 0; } -/* -----------------------------31.01.01 16:37-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox) { AssertOneEntry(); @@ -646,9 +614,7 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox) aPreviewWin.Invalidate(); return 0; } -/* -----------------------------01.06.01 10:24-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox) { AssertOneEntry(); @@ -669,9 +635,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox) aPreviewWin.Invalidate(); return 0; } -/* -----------------------------01.02.01 10:06-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG ) { AssertOneEntry(); @@ -694,9 +658,7 @@ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG ) } return 0; } -/* -----------------------------16.02.01 08:35-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit) { for(USHORT i = 0; i < 8; i++) @@ -710,9 +672,7 @@ IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit) aPreviewWin.Invalidate(); return 0; } -/* -----------------------------17.07.01 09:11-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32*, pParam) { long nRet = 0; @@ -740,9 +700,7 @@ IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32*, pParam) } return nRet; } -/* -----------------------------20.07.2001 15:18------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32*, pParam) { USHORT nIndex = USHRT_MAX; @@ -770,9 +728,7 @@ IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32*, pParam) } return 0; }; -/* -----------------------------19.06.01 11:33-------------------------------- - ---------------------------------------------------------------------------*/ void SvxRubyDialog::AssertOneEntry() { pImpl->AssertOneEntry(); @@ -810,9 +766,6 @@ void SvxRubyDialog::DataChanged( const DataChangedEvent& rDCEvt ) UpdateColors(); } -/* -----------------------------29.01.01 15:44-------------------------------- - - ---------------------------------------------------------------------------*/ void lcl_MoveBox(long nOffset, Edit& rLeft, Edit& rRight) { Size aLeftSz(rLeft.GetSizePixel()); @@ -825,9 +778,7 @@ void lcl_MoveBox(long nOffset, Edit& rLeft, Edit& rRight) rRight.SetPosSizePixel(aRightPos, aRightSz); } -/* -----------------------------16.02.01 08:09-------------------------------- - ---------------------------------------------------------------------------*/ RubyPreview::RubyPreview(SvxRubyDialog& rParent, const ResId& rResId) : Window(&rParent, rResId), rParentDlg(rParent) @@ -841,9 +792,7 @@ RubyPreview::RubyPreview(SvxRubyDialog& rParent, const ResId& rResId) : SetBorderStyle( WINDOW_BORDER_MONO ); } -/* -----------------------------29.01.01 14:05-------------------------------- - ---------------------------------------------------------------------------*/ void RubyPreview::Paint( const Rectangle& /* rRect */ ) { Font aRubyFont = GetFont(); @@ -950,17 +899,13 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) } SetFont(aSaveFont); } -/* -----------------------------16.02.01 15:12-------------------------------- - ---------------------------------------------------------------------------*/ void RubyEdit::GetFocus() { GetModifyHdl().Call(this); Edit::GetFocus(); } -/* -----------------------------17.07.01 09:00-------------------------------- - ---------------------------------------------------------------------------*/ long RubyEdit::PreNotify( NotifyEvent& rNEvt ) { long nHandled = 0; diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index b56fbec035c2..e341da72951c 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -100,9 +100,6 @@ static const sal_Char cSuffix[] = "Suffix"; static const sal_Char cBulletChar[] = "BulletChar"; static const sal_Char cBulletFontName[] = "BulletFontName"; -/* -----------------28.10.98 08:32------------------- - * - * --------------------------------------------------*/ // Die Auswahl an Bullets aus den StarSymbol static const sal_Unicode aBulletTypes[] = { @@ -446,17 +443,11 @@ SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nTy } } -/*-----------------08.02.97 12.38------------------- - ---------------------------------------------------*/ - - SvxNumValueSet::~SvxNumValueSet() +SvxNumValueSet::~SvxNumValueSet() { delete pVDev; } -/* -----------------------------30.01.01 16:24-------------------------------- - ---------------------------------------------------------------------------*/ void SvxNumValueSet::SetNumberingSettings( const Sequence<Sequence<PropertyValue> >& aNum, Reference<XNumberingFormatter>& xFormat, @@ -474,9 +465,7 @@ void SvxNumValueSet::SetNumberingSettings( SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i )); } } -/* -----------------------------31.01.01 09:50-------------------------------- - ---------------------------------------------------------------------------*/ void SvxNumValueSet::SetOutlineNumberingSettings( Sequence<Reference<XIndexAccess> >& rOutline, Reference<XNumberingFormatter>& xFormat, @@ -509,20 +498,13 @@ SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, co aFormatTimer.SetTimeoutHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl)); } -/*-----------------13.02.97 09.41------------------- - ---------------------------------------------------*/ - - SvxBmpNumValueSet::~SvxBmpNumValueSet() +SvxBmpNumValueSet::~SvxBmpNumValueSet() { GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS); aFormatTimer.Stop(); } -/*-----------------13.02.97 09.41------------------- - ---------------------------------------------------*/ -void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) +void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) { SvxNumValueSet::UserDraw(rUDEvt); @@ -552,10 +534,6 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } } -/*-----------------14.02.97 07.34------------------- - ---------------------------------------------------*/ - IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG) { // nur, wenn eine Grafik nicht da war, muss formatiert werden diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 381536998d85..683fce71fea0 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -753,9 +753,7 @@ void SvxRuler::Update( const SvxProtectItem* pItem ) { if( pItem ) pRuler_Imp->aProtectItem = *pItem; } -/* -----------------------------22.08.2002 13:10------------------------------ - ---------------------------------------------------------------------------*/ void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem) { if(bActive && bHorz) @@ -3949,9 +3947,8 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const } } } -/*-- 29.11.2007 08:24:23--------------------------------------------------- - //#i24363# tab stops relative to indent - -----------------------------------------------------------------------*/ + +// Tab stops relative to indent (#i24363#) void SvxRuler::SetTabsRelativeToIndent( BOOL bRel ) { pRuler_Imp->bIsTabsRelativeToIndent = bRel; diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx index c70da29e17f9..99a9cd371f25 100644 --- a/svx/source/dialog/swframeposstrings.cxx +++ b/svx/source/dialog/swframeposstrings.cxx @@ -51,23 +51,17 @@ SvxSwFramePosString_Impl::SvxSwFramePosString_Impl() : } FreeResource(); } -/*-- 04.03.2004 13:14:48--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxSwFramePosString::SvxSwFramePosString() : pImpl(new SvxSwFramePosString_Impl) { } -/*-- 04.03.2004 13:14:48--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxSwFramePosString::~SvxSwFramePosString() { delete pImpl; } -/*-- 04.03.2004 13:14:48--------------------------------------------------- - -----------------------------------------------------------------------*/ const String& SvxSwFramePosString::GetString(StringId eId) { DBG_ASSERT(eId >= 0 && eId < STR_MAX, "invalid StringId"); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 7d0c90b73c9d..4fba6c987d4d 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -712,8 +712,7 @@ void SdrObject::SetName(const String& rStr) if(pPlusData && pPlusData->aObjName != rStr) { - // --> OD 2009-07-09 #i73249# - // Undo/Redo for setting object's name + // Undo/Redo for setting object's name (#i73249#) bool bUndo( false ); if ( GetModel() && GetModel()->IsUndoEnabled() ) { @@ -727,14 +726,12 @@ void SdrObject::SetName(const String& rStr) GetModel()->BegUndo( pUndoAction->GetComment() ); GetModel()->AddUndo( pUndoAction ); } - // <-- pPlusData->aObjName = rStr; - // --> OD 2009-07-09 #i73249# + // Undo/Redo for setting object's name (#i73249#) if ( bUndo ) { GetModel()->EndUndo(); } - // <-- SetChanged(); BroadcastObjectChange(); } @@ -759,8 +756,7 @@ void SdrObject::SetTitle(const String& rStr) if(pPlusData && pPlusData->aObjTitle != rStr) { - // --> OD 2009-07-13 #i73249# - // Undo/Redo for setting object's title + // Undo/Redo for setting object's title (#i73249#) bool bUndo( false ); if ( GetModel() && GetModel()->IsUndoEnabled() ) { @@ -774,14 +770,12 @@ void SdrObject::SetTitle(const String& rStr) GetModel()->BegUndo( pUndoAction->GetComment() ); GetModel()->AddUndo( pUndoAction ); } - // <-- pPlusData->aObjTitle = rStr; - // --> OD 2009-07-13 #i73249# + // Undo/Redo for setting object's title (#i73249#) if ( bUndo ) { GetModel()->EndUndo(); } - // <-- SetChanged(); BroadcastObjectChange(); } @@ -806,8 +800,7 @@ void SdrObject::SetDescription(const String& rStr) if(pPlusData && pPlusData->aObjDescription != rStr) { - // --> OD 2009-07-13 #i73249# - // Undo/Redo for setting object's description + // Undo/Redo for setting object's description (#i73249#) bool bUndo( false ); if ( GetModel() && GetModel()->IsUndoEnabled() ) { @@ -821,14 +814,12 @@ void SdrObject::SetDescription(const String& rStr) GetModel()->BegUndo( pUndoAction->GetComment() ); GetModel()->AddUndo( pUndoAction ); } - // <-- pPlusData->aObjDescription = rStr; - // --> OD 2009-07-13 #i73249# + // Undo/Redo for setting object's description (#i73249#) if ( bUndo ) { GetModel()->EndUndo(); } - // <-- SetChanged(); BroadcastObjectChange(); } diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 2aa8a88e9cba..13b37db6f4bb 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -272,22 +272,19 @@ SdrObjList* SdrObjGroup::GetSubList() const const Rectangle& SdrObjGroup::GetCurrentBoundRect() const { - // --> OD 2007-02-01 #144962# - // <aOutRect> has to contain the bounding rectangle + // <aOutRect> has to contain the bounding rectangle (#144962#) if ( pSub->GetObjCount()!=0 ) { const_cast<SdrObjGroup*>(this)->aOutRect = pSub->GetAllObjBoundRect(); } return aOutRect; - // <-- } const Rectangle& SdrObjGroup::GetSnapRect() const { - // --> OD 2007-02-01 #144962# - // <aOutRect> has to contain the bounding rectangle + // <aOutRect> has to contain the bounding rectangle (#144962#) if ( pSub->GetObjCount()!=0 ) { return pSub->GetAllObjSnapRect(); @@ -296,7 +293,6 @@ const Rectangle& SdrObjGroup::GetSnapRect() const { return aOutRect; } - // <-- } void SdrObjGroup::operator=(const SdrObject& rObj) diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index 1317a0e1328d..0de206dd099a 100644 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -1124,7 +1124,7 @@ String STR_UndoMovLayer { Text [ en-US ] = "Change order of layers" ; }; -// --> OD 2009-07-09 #i73249# +// Undo/Redo for setting object's name (#i73249#) String STR_UndoObjName { Text [ en-US ] = "Change object name of %1 to" ; @@ -1137,7 +1137,6 @@ String STR_UndoObjDescription { Text [ en-US ] = "Change object description of %1" ; }; -// <-- String STR_StandardLayerName { Text [ en-US ] = "Standard" ; diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index fa360fa2bafc..906dc934e26b 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -823,9 +823,9 @@ void SdrUndoInsertObj::Redo() DBG_ASSERT(!pObj->IsInserted(),"RedoInsertObj: pObj ist bereits Inserted"); if (!pObj->IsInserted()) { - // --> OD 2005-05-10 #i45952# - restore anchor position of an object, + // Restore anchor position of an object, // which becomes a member of a group, because its cleared in method - // <InsertObject(..)>. Needed for correct ReDo in Writer. + // <InsertObject(..)>. Needed for correct ReDo in Writer. (#i45952#) Point aAnchorPos( 0, 0 ); if ( pObjList && pObjList->GetOwnerObj() && @@ -833,17 +833,15 @@ void SdrUndoInsertObj::Redo() { aAnchorPos = pObj->GetAnchorPos(); } - // <-- SdrInsertReason aReason(SDRREASON_UNDO); pObjList->InsertObject(pObj,nOrdNum,&aReason); - // --> OD 2005-05-10 #i45952# + // Arcs lose position when grouped (#i45952#) if ( aAnchorPos.X() || aAnchorPos.Y() ) { pObj->NbcSetAnchorPos( aAnchorPos ); } - // <-- } // #94278# Trigger PageChangeCall @@ -1217,7 +1215,7 @@ bool SdrUndoObjSetText::CanSdrRepeat(SdrView& rView) const return bOk; } -// --> OD 2009-07-09 #i73249# +// Undo/Redo for setting object's name (#i73249#) SdrUndoObjStrAttr::SdrUndoObjStrAttr( SdrObject& rNewObj, const ObjStrAttrType eObjStrAttr, const String& sOldStr, diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 996662310fbb..f130c84f9741 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -820,9 +820,6 @@ void FillControl::Resize() pLbFillType->SetSizePixel( Size( nW * 2 - nSep, nH ) ); pLbFillAttr->SetPosSizePixel( Point( nW * 2 + nSep, 0 ), Size( nW * 3 - nSep, nH ) ); } -/* -----------------------------08.03.2002 15:04------------------------------ - - ---------------------------------------------------------------------------*/ void FillControl::DataChanged( const DataChangedEvent& rDCEvt ) { diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 57954c550d62..50fc380eac06 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -244,9 +244,7 @@ void SvxLineBox::ReleaseFocus_Impl() pShellWnd->GrabFocus(); } } -/* -----------------------------08.03.2002 15:39------------------------------ - ---------------------------------------------------------------------------*/ void SvxLineBox::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -428,9 +426,7 @@ long SvxColorBox::Notify( NotifyEvent& rNEvt ) } return nHandled; } -/* -----------------------------08.03.2002 15:35------------------------------ - ---------------------------------------------------------------------------*/ void SvxColorBox::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -629,9 +625,7 @@ long SvxMetricField::Notify( NotifyEvent& rNEvt ) } return nHandled; } -/* -----------------------------08.03.2002 15:32------------------------------ - ---------------------------------------------------------------------------*/ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 17484f021167..ca0490fbf0b6 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -511,9 +511,7 @@ void ColumnsWindow::MouseMove( const MouseEvent& rMEvt ) nNewCol = 20; UpdateSize_Impl( nNewCol ); } -/* -----------------------------21.05.2002 16:16------------------------------ - ---------------------------------------------------------------------------*/ void ColumnsWindow::UpdateSize_Impl( long nNewCol ) { Size aWinSize = GetOutputSizePixel(); @@ -573,9 +571,7 @@ void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt ) SfxPopupWindow::MouseButtonDown( rMEvt ); CaptureMouse(); } -/* -----------------------------21.05.2002 16:11------------------------------ - ---------------------------------------------------------------------------*/ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) { BOOL bHandled = FALSE; @@ -836,9 +832,7 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading() } return pWin; } -/* -----------------18.11.99 16:38------------------- - --------------------------------------------------*/ void SvxColumnsToolBoxControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 5762964fbda2..c45e49511899 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -504,9 +504,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) } return nHandled ? nHandled : ComboBox::Notify( rNEvt ); } -/* -----------------------------08.03.2002 13:03------------------------------ - ---------------------------------------------------------------------------*/ void SvxStyleBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -1090,9 +1088,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& SetText( SVX_RESSTR(RID_SVXSTR_FRAME) ); aFrameSet.Show(); } -/*-- 22.09.2004 12:27:50--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxFrameWindow_Impl::~SvxFrameWindow_Impl() { UnbindListener(); diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 3bbe2ca67e53..d322fd4868ef 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -64,15 +64,10 @@ SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBo { } -/* -----------------------------27.04.01 15:53-------------------------------- - - ---------------------------------------------------------------------------*/ SvxVertCTLTextTbxCtrl::~SvxVertCTLTextTbxCtrl( ) { } -/* -----------------------------27.04.01 15:50-------------------------------- - ---------------------------------------------------------------------------*/ void SvxVertCTLTextTbxCtrl::StateChanged( USHORT nSID, SfxItemState eState, @@ -118,8 +113,5 @@ void SvxVertCTLTextTbxCtrl::StateChanged( } } } -/* -----------------------------27.04.01 15:50-------------------------------- - - ---------------------------------------------------------------------------*/ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 2c57a016db09..2ed5d88d3d7a 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -471,14 +471,12 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ ) OSL_ENSURE( ( mpImpl->mpCreatedObj == NULL ) || ( mpImpl->mpCreatedObj == pNewObj ), "SvxShape::Create: the same shape used for two different objects?! Strange ..." ); - // --> CL, OD 2005-07-19 #i52126# - correct condition + // Correct condition (#i52126#) if ( mpImpl->mpCreatedObj != pNewObj ) - // <-- { DBG_ASSERT( pNewObj->GetModel(), "no model for SdrObject?" ); - // --> CL, OD 2005-07-19 #i52126# + // Correct condition (#i52126#) mpImpl->mpCreatedObj = pNewObj; - // <-- if( mpObj.is() && mpObj->GetModel() ) { @@ -527,12 +525,11 @@ void SvxShape::ChangeModel( SdrModel* pNewModel ) } } - // --> CL, OD 2005-07-19 #i52126# - always listen to new model + // Always listen to new model (#i52126#) if( pNewModel ) { StartListening( *pNewModel ); } - // <-- // HACK #i53696# ChangeModel should be virtual, but it isn't. can't change that for 2.0.1 SvxShapeText* pShapeText = dynamic_cast< SvxShapeText* >( this ); @@ -576,8 +573,7 @@ void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw() } } -//---------------------------------------------------------------------- -// --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051 +// Reintroduction of fix for issue i59051 (#i108851#) void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw() { DBG_TESTSOLARMUTEX(); @@ -634,8 +630,7 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw() } } -//---------------------------------------------------------------------- -// --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051 +// Reintroduction of fix for issue i59051 (#i108851#) void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw() { DBG_TESTSOLARMUTEX(); @@ -2555,11 +2550,10 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper { Point aPoint( aUnoPoint.X, aUnoPoint.Y ); - // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051 + // Reintroduction of fix for issue i59051 (#i108851#) // perform metric change before applying anchor position, // because the anchor position is in pool metric. ForceMetricToItemPoolMetric( aPoint ); - // <-- if( mpModel->IsWriter() ) aPoint += mpObj->GetAnchorPos(); @@ -2586,9 +2580,8 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper if ( rValue >>= aPolyPoly ) { basegfx::B2DPolyPolygon aNewPolyPolygon( SvxConvertPolyPolygonBezierToB2DPolyPolygon( &aPolyPoly ) ); - // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051 + // Reintroduction of fix for issue i59051 (#i108851#) ForceMetricToItemPoolMetric( aNewPolyPolygon ); - // <-- if( mpModel->IsWriter() ) { Point aPoint( mpObj->GetAnchorPos() ); @@ -2611,9 +2604,8 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper { Point aPoint( aUnoPoint.X, aUnoPoint.Y ); - // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051 + // Reintroduction of fix for issue #i59051# (#i108851#) ForceMetricToItemPoolMetric( aPoint ); - // <-- if( mpModel->IsWriter() ) aPoint += mpObj->GetAnchorPos(); @@ -3040,9 +3032,8 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper Point aPoint( mpObj->GetAnchorPos() ); aPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aPoint.X(), -aPoint.Y())); } - // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue 59051 + // Reintroduction of fix for issue #i59051# (#i108851#) ForceMetricTo100th_mm( aPolyPoly ); - // <-- drawing::PolyPolygonBezierCoords aRetval; SvxConvertB2DPolyPolygonToPolyPolygonBezier( aPolyPoly, aRetval); rValue <<= aRetval; @@ -3063,9 +3054,8 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper if( mpModel->IsWriter() ) aPoint -= mpObj->GetAnchorPos(); - // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue 59051 + // Reintroduction of fix for issue #i59051# (#i108851#) ForceMetricTo100th_mm( aPoint ); - // <-- awt::Point aUnoPoint( aPoint.X(), aPoint.Y() ); rValue <<= aUnoPoint; |