ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

remove old standalone Sun bug numbers

Browse Source 
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>
This commit is contained in:
Noel Grandin
2015-10-01 06:57:19 +00:00
committed by Noel Grandin
parent 8e27c68847
commit e209d115d4
179 changed files with 49 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basctl/source/dlged/dlgedobj.cxx
-6
View File
@@ -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,
basctl/source/dlged/dlgedview.cxx
-1
View File
@@ -37,7 +37,6 @@ DlgEdView::DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor)
SdrView(&rModel, &rOut),
rDlgEditor(rEditor)
{
// #114898#
SetBufferedOutputAllowed(true);
SetBufferedOverlayAllowed(true);
}
comphelper/source/misc/accessiblewrapper.cxx
-1
View File
@@ -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
cui/source/dialogs/hlinettp.cxx
+1 -1
View File
@@ -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);
}
cui/source/dialogs/hltpbase.cxx
-1
View File
@@ -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 )
cui/source/inc/cuitabline.hxx
-3
View File
@@ -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
cui/source/options/optinet2.cxx
-1
View File
@@ -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;
cui/source/tabpages/grfpage.cxx
-1
View File
@@ -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 ==
cui/source/tabpages/numpages.cxx
-4
View File
@@ -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);
cui/source/tabpages/tparea.cxx
-1
View File
@@ -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);
cui/source/tabpages/tpline.cxx
-11
View File
@@ -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();
cui/source/tabpages/transfrm.cxx
-1
View File
@@ -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();
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
-1
View File
@@ -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.
dtrans/source/win32/dtobj/FmtFilter.cxx
-1
View File
@@ -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" );
editeng/source/editeng/impedit3.cxx
-1
View File
@@ -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() )
editeng/source/items/svxfont.cxx
-6
View File
@@ -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());
editeng/source/uno/unoedprx.cxx
-2
View File
@@ -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
editeng/source/uno/unofored.cxx
-2
View File
@@ -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.
extensions/source/bibliography/bibbeam.cxx
-4
View File
@@ -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;
extensions/source/bibliography/bibbeam.hxx
-2
View File
@@ -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();
extensions/source/bibliography/bibload.cxx
-1
View File
@@ -301,7 +301,6 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUSt
}
m_xDatMan->load();
// #100312# ----------
m_pDatMan->RegisterInterceptor(pBeamer);
if ( rListener.is() )
extensions/source/bibliography/datman.hxx
-5
View File
@@ -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();
extensions/source/propctrlr/browserline.cxx
-3
View File
@@ -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();
}
extensions/source/propctrlr/browserview.cxx
-1
View File
@@ -104,7 +104,6 @@ namespace pcr
m_pPropBox->SetSizePixel(aSize);
}
// #95343# ---------------------------------------------------------------
::com::sun::star::awt::Size OPropertyBrowserView::getMinimumSize()
{
Size aSize = GetOutputSizePixel();
extensions/source/propctrlr/propcontroller.hxx
+1 -2
View File
@@ -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;
extensions/source/propctrlr/propertyeditor.hxx
-1
View File
@@ -108,7 +108,6 @@ namespace pcr
void setPageActivationHandler(const Link<LinkParamNone*,void>& _rHdl) { m_aPageActivationHandler = _rHdl; }
// #95343# -------------------------------
sal_Int32 getMinimumWidth();
sal_Int32 getMinimumHeight();
filter/source/msfilter/escherex.cxx
-2
View File
@@ -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);
filter/source/msfilter/msdffimp.cxx
+1 -2
View File
@@ -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.
filter/source/msfilter/svdfppt.cxx
+2 -2
View File
@@ -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;
filter/source/svg/svgexport.cxx
-1
View File
@@ -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 );
fpicker/source/office/OfficeFilePicker.cxx
-8
View File
@@ -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 );
fpicker/source/office/OfficeFilePicker.hxx
-1
View File
@@ -70,7 +70,6 @@ protected:
OUString m_aDefaultName;
OUString m_aCurrentFilter;
// #97148# --------------
OUString m_aOldDisplayDirectory;
OUString m_aOldHideDirectory;
fpicker/source/office/iodlgimp.cxx
-2
View File
@@ -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();
include/comphelper/accessiblecontexthelper.hxx
-1
View File
@@ -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,
include/filter/msfilter/msdffimp.hxx
-1
View File
@@ -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
include/svx/float3d.hxx
+1 -1
View File
@@ -226,7 +226,7 @@ public:
void GetAttr( SfxItemSet& rSet );
void UpdatePreview(); // nach oben (private)
void DocumentReload(); // #83951#
void DocumentReload();
};
/*************************************************************************
include/svx/sdr/overlay/overlayobjectcell.hxx
-1
View File
@@ -26,7 +26,6 @@
// #114409#
namespace sdr
{
namespace overlay
include/svx/svdmodel.hxx
+1 -3
View File
@@ -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
include/svx/svdobj.hxx
-4
View File
@@ -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;
include/svx/svdocapt.hxx
-1
View File
@@ -37,7 +37,6 @@ namespace sdr { namespace properties {
// Helper Class SdrCaptObjGeoData
// #109872#
class SdrCaptObjGeoData : public SdrTextObjGeoData
{
public:
include/svx/svdocirc.hxx
-1
View File
@@ -29,7 +29,6 @@ namespace sdr { namespace properties {
// Helper class SdrCircObjGeoData
// #109872#
class SdrCircObjGeoData : public SdrTextObjGeoData
{
public:
include/svx/svdoedge.hxx
-4
View File
@@ -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:
include/svx/svdograf.hxx
-3
View File
@@ -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);
include/svx/svdoole2.hxx
-1
View File
@@ -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;
include/svx/svdopage.hxx
-2
View File
@@ -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);
include/svx/svdotext.hxx
-7
View File
@@ -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);
include/svx/svdpagv.hxx
-2
View File
@@ -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
include/svx/svdpntv.hxx
+1 -4
View File
@@ -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; }
include/xmloff/shapeexport.hxx
-1
View File
@@ -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; }
include/xmloff/shapeimport.hxx
-1
View File
@@ -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;
include/xmloff/txtimp.hxx
-1
View File
@@ -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);
include/xmloff/xmlimp.hxx
-1
View File
@@ -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,
sal/rtl/bootstrap.cxx
-1
View File
@@ -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)
sc/source/core/data/documen9.cxx
-2
View File
@@ -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())
{
sc/source/core/tool/compiler.cxx
+1 -1
View File
@@ -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
sc/source/filter/xml/xmlexprt.cxx
-1
View File
@@ -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)
sc/source/filter/xml/xmlimprt.cxx
-5
View File
@@ -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 ));
}
sc/source/filter/xml/xmlimprt.hxx
-1
View File
@@ -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);
sc/source/ui/app/drwtrans.cxx
-4
View File
@@ -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();
sc/source/ui/drawfunc/fudraw.cxx
-5
View File
@@ -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
sc/source/ui/inc/gridwin.hxx
-3
View File
@@ -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();
sc/source/ui/inc/output.hxx
-2
View File
@@ -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; }
sc/source/ui/src/scstring.src
-1
View File
@@ -474,7 +474,6 @@ String SCSTR_UNDO_GRAFFILTER
Text [ en-US ] = "Image Filter" ;
};
// #98185#
String STR_CAPTION_DEFAULT_TEXT
{
Text [ en-US ] = "Text" ;
sc/source/ui/unoobj/docuno.cxx
-1
View File
@@ -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 )
sc/source/ui/view/editsh.cxx
+2 -2
View File
@@ -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 )
{
sc/source/ui/view/gridwin.cxx
-5
View File
@@ -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();
sc/source/ui/view/gridwin3.cxx
-1
View File
@@ -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
sc/source/ui/view/output.cxx
+1 -1
View File
@@ -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 ),
sc/source/ui/view/output3.cxx
-5
View File
@@ -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;
sc/source/ui/view/preview.cxx
+1 -2
View File
@@ -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);
sc/source/ui/view/printfun.cxx
-2
View File
@@ -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
sc/source/ui/view/tabview2.cxx
-1
View File
@@ -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])
sc/source/ui/view/tabview3.cxx
-2
View File
@@ -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();
}
sc/source/ui/view/tabview5.cxx
-1
View File
@@ -256,7 +256,6 @@ void ScTabView::DoAddWin( ScGridWindow* pWin )
{
pDrawView->AddWindowToPaintView(pWin, 0);
// #114409#
pWin->DrawLayerCreated();
}
}
sc/source/ui/view/tabvwsh4.cxx
-1
View File
@@ -1725,7 +1725,6 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
GetBorderSize( aBorder, Size() );
SetBorderPixel( aBorder );
// #114409#
MakeDrawLayer();
}
sc/source/ui/view/tabvwshb.cxx
-1
View File
@@ -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 );
scaddins/source/analysis/analysishelper.cxx
+2 -2
View File
@@ -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();
}
svtools/source/config/colorcfg.cxx
-3
View File
@@ -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) );
}
svtools/source/config/extcolorcfg.cxx
-3
View File
@@ -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) );
}
svtools/source/contnr/fileview.cxx
-10
View File
@@ -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;
svtools/source/contnr/svimpbox.cxx
-1
View File
@@ -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!" );
svtools/source/inc/svimpbox.hxx
-5
View File
@@ -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 );
svx/source/accessibility/AccessibleTextHelper.cxx
-1
View File
@@ -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
svx/source/customshapes/EnhancedCustomShape3d.cxx
-1
View File
@@ -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.
svx/source/dialog/connctrl.cxx
-1
View File
@@ -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
svx/source/engine3d/svx3ditems.cxx
-5
View File
@@ -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)
svx/source/fmcomp/fmgridcl.cxx
-1
View File
@@ -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 );
svx/source/form/fmPropBrw.cxx
-1
View File
@@ -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() )
{
svx/source/form/navigatortree.cxx
-1
View File
@@ -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;
svx/source/inc/xmlxtexp.hxx
-1
View File
@@ -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,
svx/source/inc/xmlxtimp.hxx
-1
View File
@@ -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,
svx/source/sdr/overlay/overlayobjectcell.cxx
-1
View File
@@ -30,7 +30,6 @@
using namespace ::basegfx;
// #114409#
namespace sdr
{
namespace overlay
svx/source/sdr/properties/attributeproperties.cxx
-2
View File
@@ -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.
svx/source/sdr/properties/emptyproperties.cxx
-1
View File
@@ -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.
}
svx/source/sdr/properties/groupproperties.cxx
-1
View File
@@ -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
svx/source/svdraw/svdedxv.cxx
+1 -5
View File
@@ -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
svx/source/svdraw/svdhdl.cxx
-1
View File
@@ -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>
svx/source/svdraw/svdoashp.cxx
-3
View File
@@ -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();
svx/source/svdraw/svdoole2.cxx
-1
View File
@@ -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 );
svx/source/svdraw/svdotxdr.cxx
-1
View File
@@ -211,7 +211,6 @@ bool SdrTextObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
rStat.TakeCreateRect(maRect);
ImpJustifyRect(maRect);
// #115391#
AdaptTextMinSize();
SetRectsDirty();

Some files were not shown because too many files have changed in this diff Show More