[Libreoffice-commits] .: 7 commits - sd/source sfx2/inc sfx2/source svx/inc svx/source sw/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Sep 7 00:55:28 PDT 2011
sd/source/filter/eppt/epptbase.hxx | 2 -
sd/source/filter/eppt/epptso.cxx | 10 ++---
sfx2/inc/sfx2/viewsh.hxx | 1
sfx2/source/dialog/versdlg.cxx | 17 --------
sfx2/source/view/viewsh.cxx | 7 ---
svx/inc/svx/svdmrkv.hxx | 10 -----
svx/inc/svx/svdview.hxx | 2 -
svx/source/svdraw/svdmrkv.cxx | 72 ------------------------------------
svx/source/svdraw/svdmrkv1.cxx | 40 --------------------
svx/source/svdraw/svdview.cxx | 31 ---------------
sw/source/core/txtnode/fntcache.cxx | 1
sw/source/ui/app/docsh.cxx | 4 --
unusedcode.easy | 6 ---
13 files changed, 7 insertions(+), 196 deletions(-)
New commits:
commit 15cbe38e85124f449d536717c81da4071978e50f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 7 08:54:10 2011 +0100
callcatcher: unused code
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index cadae46..dd4166b 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -190,7 +190,6 @@ protected:
sal_Bool MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark);
void SetMoveOutside(sal_Bool bOn);
- sal_Bool IsMoveOutside() const;
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -249,14 +248,7 @@ public:
void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); }
sal_Bool IsFrameDragSingles() const { return IsFrameHandles(); }
- // Feststellen, ob und wo ein Objekt bzw. ob ein Referenzpunkt
- // (Rotationsmittelpunkt,Spiegelachse) getroffen wird (SW special).
- SdrHitKind PickSomething(const Point& rPnt, short nTol=-2) const;
sal_Bool HasMarkableObj() const;
- sal_uIntPtr GetMarkableObjCount() const;
- //HMHvoid ShowMarkHdl(bool bNoRefHdl = false);
- //HMHvoid HideMarkHdl(bool bNoRefHdl = false);
- //HMHBOOL IsMarkHdlShown() const { return bHdlShown; }
////////////////////////////////////////////////////////////////////////////////////////////////////
// migrate selections
@@ -417,9 +409,7 @@ public:
sal_Bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; }
sal_Bool HasMarkableGluePoints() const;
- sal_uIntPtr GetMarkableGluePointCount() const;
sal_Bool HasMarkedGluePoints() const;
- sal_uIntPtr GetMarkedGluePointCount() const;
// Ein Klebepunkt wird eindeutig identifiziert durch das SdrObject
// (dem er zugehoert) sowie einem sal_uInt16 nId (da jedes SdrObject je
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 0469d70..2213da9 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -558,50 +558,6 @@ sal_Bool SdrMarkView::HasMarkableObj() const
return nCount!=0;
}
-sal_uIntPtr SdrMarkView::GetMarkableObjCount() const
-{
- sal_uIntPtr nCount=0;
- SdrPageView* pPV = GetSdrPageView();
-
- if(pPV)
- {
- SdrObjList* pOL=pPV->GetObjList();
- sal_uIntPtr nObjAnz=pOL->GetObjCount();
- for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
- SdrObject* pObj=pOL->GetObj(nObjNum);
- if (IsObjMarkable(pObj,pPV)) {
- nCount++;
- }
- }
- }
- return nCount;
-}
-
-//HMHvoid SdrMarkView::ImpShowMarkHdl(bool /*bNoRefHdl*/)
-//HMH{
-//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders
-//HMH if (!bHdlShown) {
-//HMH bRefHdlShownOnly=sal_False;
-//HMH bHdlShown=sal_True;
-//HMH }
-//HMH}
-
-//HMHvoid SdrMarkView::ShowMarkHdl(bool /*bNoRefHdl*/)
-//HMH{
-//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders
-//HMH ImpShowMarkHdl(bNoRefHdl);
-//HMH}
-
-
-//HMHvoid SdrMarkView::HideMarkHdl(bool /*bNoRefHdl*/)
-//HMH{
-//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders
-//HMH if (bHdlShown) {
-//HMH bRefHdlShownOnly=bNoRefHdl;
-//HMH bHdlShown=sal_False;
-//HMH }
-//HMH}
-
void SdrMarkView::hideMarkHandles()
{
if(!mbMarkHandlesHidden)
@@ -1926,29 +1882,6 @@ sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPag
return bFnd;
}
-SdrHitKind SdrMarkView::PickSomething(const Point& rPnt, short nTol) const
-{
- nTol=ImpGetHitTolLogic(nTol,NULL);
- SdrHitKind eRet=SDRHIT_NONE;
- Point aPt(rPnt);
- SdrObject* pObj=NULL;
- SdrPageView* pPV=NULL;
- if (eRet==SDRHIT_NONE && PickObj(rPnt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) {
- Rectangle aRct1(aPt-Point(nTol,nTol),aPt+Point(nTol,nTol)); // HitRect fuer Toleranz
- Rectangle aBR(pObj->GetCurrentBoundRect());
- if (aRct1.IsInside(aBR.TopLeft())) eRet=SDRHIT_BOUNDTL;
- else if (aRct1.IsInside(aBR.TopCenter())) eRet=SDRHIT_BOUNDTC;
- else if (aRct1.IsInside(aBR.TopRight())) eRet=SDRHIT_BOUNDTR;
- else if (aRct1.IsInside(aBR.LeftCenter())) eRet=SDRHIT_BOUNDCL;
- else if (aRct1.IsInside(aBR.RightCenter())) eRet=SDRHIT_BOUNDCR;
- else if (aRct1.IsInside(aBR.BottomLeft())) eRet=SDRHIT_BOUNDBL;
- else if (aRct1.IsInside(aBR.BottomCenter())) eRet=SDRHIT_BOUNDBC;
- else if (aRct1.IsInside(aBR.BottomRight())) eRet=SDRHIT_BOUNDBR;
- else eRet=SDRHIT_OBJECT;
- }
- return eRet;
-}
-
void SdrMarkView::UnmarkAllObj(SdrPageView* pPV)
{
if (GetMarkedObjectCount()!=0) {
@@ -2138,11 +2071,6 @@ void SdrMarkView::SetMoveOutside(sal_Bool bOn)
aHdl.SetMoveOutside(bOn);
}
-sal_Bool SdrMarkView::IsMoveOutside() const
-{
- return aHdl.IsMoveOutside();
-}
-
void SdrMarkView::SetDesignMode( sal_Bool _bOn )
{
if ( bDesignMode != _bOn )
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 3ac2df2..c295b5c 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -471,33 +471,6 @@ sal_Bool SdrMarkView::HasMarkableGluePoints() const
return bRet;
}
-sal_uIntPtr SdrMarkView::GetMarkableGluePointCount() const
-{
- sal_uIntPtr nAnz=0;
- if (IsGluePointEditMode()) {
- ForceUndirtyMrkPnt();
- sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
- for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
- const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
- const SdrObject* pObj=pM->GetMarkedSdrObj();
- const SdrGluePointList* pGPL=pObj->GetGluePointList();
-
- // #i38892#
- if(pGPL && pGPL->GetCount())
- {
- for(sal_uInt16 a(0); a < pGPL->GetCount(); a++)
- {
- if((*pGPL)[a].IsUserDefined())
- {
- nAnz++;
- }
- }
- }
- }
- }
- return nAnz;
-}
-
sal_Bool SdrMarkView::HasMarkedGluePoints() const
{
ForceUndirtyMrkPnt();
@@ -511,19 +484,6 @@ sal_Bool SdrMarkView::HasMarkedGluePoints() const
return bRet;
}
-sal_uIntPtr SdrMarkView::GetMarkedGluePointCount() const
-{
- ForceUndirtyMrkPnt();
- sal_uIntPtr nAnz=0;
- sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
- for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
- const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
- const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- if (pPts!=NULL) nAnz+=pPts->GetCount();
- }
- return nAnz;
-}
-
sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark)
{
if (!IsGluePointEditMode() && !bUnmark) return sal_False;
diff --git a/unusedcode.easy b/unusedcode.easy
index 0f9eeec..4e0463f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -665,8 +665,6 @@ SdrHint::SetRect(Rectangle const&)
SdrLayerAdmin::MoveLayer(SdrLayer*, unsigned short)
SdrMark::GetObjList() const
SdrMark::GetPage() const
-SdrMarkView::IsMoveOutside() const
-SdrMarkView::PickSomething(Point const&, short) const
SdrMarkView::UnmarkGluePoint(SdrHdl const&)
SdrMediaObj::getGraphic() const
SdrMediaObj::hasPreferredSize() const
commit c346afa762ea6f71614b82b57c142451db3b7b50
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 7 08:51:00 2011 +0100
Resolves/Related: fdo#40449 uninitialized issymbol member variable
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 254fc0a..6957230 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -128,6 +128,7 @@ SwFntObj::SwFntObj( const SwSubFont &rFont, const void *pOwn, ViewShell *pSh ) :
nExtLeading = USHRT_MAX;
nPrtAscent = USHRT_MAX;
nPrtHeight = USHRT_MAX;
+ bSymbol = RTL_TEXTENCODING_SYMBOL == aFont.GetCharSet();
bPaintBlank = ( UNDERLINE_NONE != aFont.GetUnderline()
|| UNDERLINE_NONE != aFont.GetOverline()
|| STRIKEOUT_NONE != aFont.GetStrikeout() )
commit 9233083e090dc8adfa36fa56552bcd3bb5a6bb2a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 7 00:04:31 2011 +0100
callcatcher: unused code
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 0a1ffdb..8fccd8c 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -302,7 +302,6 @@ public:
SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( sal_Bool bCreate = sal_True ) const;
SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP );
SAL_DLLPRIVATE void DiscardClients_Impl();
- SAL_DLLPRIVATE sal_Bool PlugInsActive() const;
SAL_DLLPRIVATE SfxPrinter* SetPrinter_Impl( SfxPrinter *pNewPrinter );
SAL_DLLPRIVATE sal_Bool IsShowView_Impl() const;
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 78b0c24..b98ff53 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -99,7 +99,6 @@ public:
void DelDtor();
SvStream& Read( SvStream & );
SvStream& Write( SvStream & ) const;
- SvStringsDtor* GetVersions() const;
size_t size() const
{ return aTableList.size(); }
@@ -157,22 +156,6 @@ static String ConvertDateTime_Impl(const DateTime& rTime, const LocaleDataWrappe
return aStr;
}
-SvStringsDtor* SfxVersionTableDtor::GetVersions() const
-{
- SvStringsDtor *pList = new SvStringsDtor;
- LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
-
- for ( size_t i = 0, n = aTableList.size(); i < n; ++i )
- {
- SfxVersionInfo* pInfo = aTableList[ i ];
- String *pString = new String( pInfo->aComment );
- (*pString) += DEFINE_CONST_UNICODE( "; " );
- (*pString) += ConvertDateTime_Impl( pInfo->aCreationDate, aLocaleWrapper );
- pList->Insert( pString, pList->Count() );
- }
- return pList;
-}
-
// Caution in the code this array si indexed directly (0, 1, ...)
static long nTabs_Impl[] =
{
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index eb56125..ff96e69 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1860,13 +1860,6 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan
}
//--------------------------------------------------------------------
-
-sal_Bool SfxViewShell::PlugInsActive() const
-{
- return pImp->m_bPlugInsActive;
-}
-
-//--------------------------------------------------------------------
void SfxViewShell::DiscardClients_Impl()
/* [Description]
diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
index f50d6e7..efd51a6 100644
--- a/svx/inc/svx/svdview.hxx
+++ b/svx/inc/svx/svdview.hxx
@@ -260,8 +260,6 @@ public:
sal_Bool IsMarkPossible() const;
void MarkAll();
void UnmarkAll();
- sal_Bool IsAllMarked() const;
- sal_Bool IsAllMarkPrevNextPossible() const; // das geht naemlich nicht bei TextEdit!
sal_Bool MarkNext(sal_Bool bPrev=sal_False);
sal_Bool MarkNext(const Point& rPnt, sal_Bool bPrev=sal_False);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 13cc430..b4d7725 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1382,23 +1382,6 @@ void SdrView::UnmarkAll()
else UnmarkAllObj();
}
-sal_Bool SdrView::IsAllMarked() const
-{
- if (IsTextEdit()) {
- return ImpIsTextEditAllSelected();
- }
- if (IsGluePointEditMode()) {
- sal_uIntPtr nAnz=GetMarkableGluePointCount();
- return nAnz!=0 && nAnz==GetMarkedGluePointCount();
- }
- if (HasMarkedPoints()) {
- sal_uIntPtr nAnz=GetMarkablePointCount();
- return nAnz!=0 && nAnz==GetMarkedPointCount();
- }
- sal_uIntPtr nAnz=GetMarkableObjCount();
- return nAnz!=0 && nAnz == GetMarkedObjectCount();
-}
-
sal_Bool SdrView::IsMarkPossible() const
{
if(IsTextEdit())
@@ -1419,20 +1402,6 @@ sal_Bool SdrView::IsMarkPossible() const
return HasMarkableObj();
}
-sal_Bool SdrView::IsAllMarkPrevNextPossible() const
-{
- if (IsTextEdit()) {
- return sal_False;
- }
- if (IsGluePointEditMode()) {
- return HasMarkableGluePoints();
- }
- if (HasMarkedPoints()) {
- return HasMarkablePoints();
- }
- return HasMarkableObj();
-}
-
sal_Bool SdrView::MarkNext(sal_Bool bPrev)
{
if (IsTextEdit()) {
diff --git a/unusedcode.easy b/unusedcode.easy
index 2825fc2..0f9eeec 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -722,8 +722,6 @@ SdrTextObj::StopTextAnimation(OutputDevice*, long)
SdrUndoAttrObj::SetRepeatAttr(SfxItemSet const&)
SdrUndoGroup::SdrUndoGroup(SdrModel&, String const&)
SdrUndoGroup::push_front(SdrUndoAction*)
-SdrView::IsAllMarkPrevNextPossible() const
-SdrView::IsAllMarked() const
SdrView::IsDeleteMarkedPossible() const
SdrView::IsMarkPossible() const
SdrView::MarkNext(Point const&, unsigned char)
@@ -839,10 +837,8 @@ SfxUShortRanges::Intersects(SfxUShortRanges const&) const
SfxUShortRanges::SfxUShortRanges(int, int, int, ...)
SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*)
SfxUnoStyleSheet::SfxUnoStyleSheet(SfxStyleSheet const&)
-SfxVersionTableDtor::GetVersions() const
SfxViewFactory::~SfxViewFactory()
SfxViewFrame::Hide()
-SfxViewShell::PlugInsActive() const
SfxViewShell::SetAdditionalPrintOptions(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
SfxViewShell::SetScrollingMode(SfxScrollingMode)
SfxWhichIter::LastWhich()
commit 4f7bb219c0a9b377c05c091575e97097e41ec41a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 7 00:03:11 2011 +0100
surely a terrible idea to use a random system encoding here
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 9dc3cab..8e3a424 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2597,7 +2597,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( ( nStringLen > 1 ) && ( ( xCompObj->Tell() + nStringLen ) < nStreamLen ) )
{ // i think that the OleIdentifier will follow
rtl::OString aTemp = read_uInt8s_AsOString(*xCompObj, nStringLen - 1);
- aOleIdentifier = rtl::OStringToOUString( aTemp, gsl_getSystemTextEncoding() );
+ aOleIdentifier = rtl::OStringToOUString(aTemp, RTL_TEXTENCODING_MS_1252);
}
}
}
commit 2c51e2a65a7a8ea72748ce570af8ab7bbb1fbf72
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 7 00:00:26 2011 +0100
use read_uInt8s_AsOString here
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index c0c81fd..9dc3cab 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2596,10 +2596,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
*xCompObj >> nStringLen;
if ( ( nStringLen > 1 ) && ( ( xCompObj->Tell() + nStringLen ) < nStreamLen ) )
{ // i think that the OleIdentifier will follow
- ByteString aTemp;
- sal_Char* p = aTemp.AllocBuffer( (sal_uInt16)(nStringLen - 1) );
- xCompObj->Read( p, nStringLen - 1 );
- aOleIdentifier = String( aTemp, gsl_getSystemTextEncoding() );
+ rtl::OString aTemp = read_uInt8s_AsOString(*xCompObj, nStringLen - 1);
+ aOleIdentifier = rtl::OStringToOUString( aTemp, gsl_getSystemTextEncoding() );
}
}
}
commit 0d1eb4ab6c1093bb1cc94be73c1640b92a75521d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 6 23:59:52 2011 +0100
ByteString->rtl::OString
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 79244e8..ae4433d 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -139,7 +139,7 @@ class PPTExBulletProvider
public :
- sal_uInt16 GetId( const ByteString& rUniqueId, Size& rGraphicSize );
+ sal_uInt16 GetId( const rtl::OString& rUniqueId, Size& rGraphicSize );
PPTExBulletProvider();
~PPTExBulletProvider();
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index da2ebfe..c0c81fd 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -132,11 +132,11 @@ PPTExBulletProvider::~PPTExBulletProvider()
delete pGraphicProv;
}
-sal_uInt16 PPTExBulletProvider::GetId( const ByteString& rUniqueId, Size& rGraphicSize )
+sal_uInt16 PPTExBulletProvider::GetId( const rtl::OString& rUniqueId, Size& rGraphicSize )
{
sal_uInt16 nRetValue = 0xffff;
- if ( rUniqueId.Len() )
+ if ( !rUniqueId.isEmpty() )
{
Rectangle aRect;
GraphicObject aGraphicObject( rUniqueId );
commit c42d6682723230a2d86a0ef218496b35fab1db06
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 6 16:33:37 2011 +0100
probably want a SfxBoolItem of false here
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index ba82104..c4d9e84 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -379,9 +379,7 @@ sal_Bool SwDocShell::Save()
SfxViewFrame* pFrm = pWrtShell ? pWrtShell->GetView().GetViewFrame() : 0;
if( pFrm )
{
- //TODO: this is probably wrong: we should have a SfxBoolItem here, is
- //this intended to set the state to modified ? or not modified ?
- pFrm->GetBindings().SetState( SfxStringItem( SID_DOC_MODIFIED, ' ' ));
+ pFrm->GetBindings().SetState(SfxBoolItem(SID_DOC_MODIFIED, sal_False));
}
return !IsError( nErr );
}
More information about the Libreoffice-commits
mailing list