[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Sep 8 01:30:07 PDT 2011
binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx | 3 +--
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 10 ----------
binfilter/inc/bf_sw/doc.hxx | 3 ---
binfilter/inc/bf_sw/swcrsr.hxx | 4 ----
binfilter/inc/bf_sw/viewsh.hxx | 22 ----------------------
5 files changed, 1 insertion(+), 41 deletions(-)
New commits:
commit a0767ffd085b6bc57e4ebbe74339b6fa1097929e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 7 23:00:03 2011 +0100
remove inlines, expand FALSEs
diff --git a/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx b/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx
index d37ca0c..43a87ab 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx
@@ -372,8 +372,7 @@ struct _PercentHdl
/*N*/ {
/*N*/ SwTableCursor* pTblCrsr = (SwTableCursor*)*this;
/*N*/ if( pTblCrsr )
-/*N*/ return bLeft ? pTblCrsr->GoPrevCell( nCnt )
-/*N*/ : pTblCrsr->GoNextCell( nCnt );
+/*N*/ return FALSE;
/*N*/
/*N*/ // calculate cursor bidi level
/*N*/ const SwCntntFrm* pSttFrm = NULL;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index 86f4c50..af87b73 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -1505,7 +1505,6 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName,
case FN_UNO_TABLE_CELL_BACKGROUND:
{
SvxBrushItem aBrush;
- pDoc->GetBoxBackground( *pUnoCrsr, aBrush );
aBrush.PutValue(aValue, pMap->nMemberId);
pDoc->SetBoxAttr( *pUnoCrsr, aBrush );
@@ -1559,10 +1558,6 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
{
case FN_UNO_TABLE_CELL_BACKGROUND:
{
- SvxBrushItem aBrush;
- if(pTblCrsr->GetDoc()->GetBoxBackground( *pUnoCrsr, aBrush ))
- aBrush.QueryValue(aRet, pMap->nMemberId);
-
}
break;
case RES_BOXATR_FORMAT:
@@ -3450,7 +3445,6 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName,
case FN_UNO_TABLE_CELL_BACKGROUND:
{
SvxBrushItem aBrush;
- pDoc->GetBoxBackground( *pTblCrsr, aBrush );
((SfxPoolItem&)aBrush).PutValue(aValue, pMap->nMemberId);
pDoc->SetBoxAttr( *pTblCrsr, aBrush );
@@ -3552,10 +3546,6 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName) throw( be
{
case FN_UNO_TABLE_CELL_BACKGROUND:
{
- SvxBrushItem aBrush;
- if(pTblCrsr->GetDoc()->GetBoxBackground( *pTblCrsr, aBrush ))
- aBrush.QueryValue(aRet, pMap->nMemberId);
-
}
break;
case RES_BOX :
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index a0f2de3..2f7647d 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -1236,8 +1236,6 @@ public:
const SwTableBox* /*pStart*/, sal_Bool /*bCurRowOnly*/){DBG_BF_ASSERT(0, "STRIP");}
void SetHeadlineRepeat( SwTable& /*rTable*/, sal_Bool /*bSet*/ ){DBG_BF_ASSERT(0, "STRIP");}
- // AutoFormat fuer die Tabelle/TabellenSelection
- sal_Bool SetTableAutoFmt( const SwSelBoxes& /*rBoxes*/, const SwTableAutoFmt& /*rNew*/ ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
// Erfrage wie attributiert ist
// setze das TabelleAttribut Undo auf:
// setze das InsertDB als Tabelle Undo auf:
@@ -1433,7 +1431,6 @@ public:
void SetTabBorders( const SwCursor& /*rCursor*/, const SfxItemSet& /*rSet*/ ){DBG_BF_ASSERT(0, "STRIP");}
void GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const;
void SetBoxAttr( const SwCursor& /*rCursor*/, const SfxPoolItem& /*rNew*/ ){DBG_BF_ASSERT(0, "STRIP");}
- sal_Bool GetBoxBackground( const SwCursor& /*rCursor*/, SvxBrushItem& /*rToFill*/ ) const{DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
int Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest );
void Unchain( SwFrmFmt &rFmt );
diff --git a/binfilter/inc/bf_sw/swcrsr.hxx b/binfilter/inc/bf_sw/swcrsr.hxx
index e03325f..3397edc 100644
--- a/binfilter/inc/bf_sw/swcrsr.hxx
+++ b/binfilter/inc/bf_sw/swcrsr.hxx
@@ -140,8 +140,6 @@ public:
END_SENT
};
bool GoSentence(SentenceMoveType eMoveType);
- bool GoNextSentence(){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
- bool GoPrevSentence(){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
bool LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, BOOL bAllowVisual,
BOOL bInsertCrsr );
@@ -158,8 +156,6 @@ public:
bool RightMargin() { DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
bool SttDoc() { DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
bool EndDoc() { DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
- bool GoNextCell( USHORT nCnt = 1 ) { DBG_BF_ASSERT(0, "STRIP"); (void)nCnt; return FALSE;}
- bool GoPrevCell( USHORT nCnt = 1 ) { DBG_BF_ASSERT(0, "STRIP"); (void)nCnt; return FALSE;}
bool GotoTblBox( const String& rName );
bool MovePara( SwWhichPara, SwPosPara );
diff --git a/binfilter/inc/bf_sw/viewsh.hxx b/binfilter/inc/bf_sw/viewsh.hxx
index 78c6a75..31c74e5 100644
--- a/binfilter/inc/bf_sw/viewsh.hxx
+++ b/binfilter/inc/bf_sw/viewsh.hxx
@@ -64,18 +64,10 @@ class SwPagePreViewPrtData;
struct ShellResource;
class SwFrm;
struct SwPrintData;
-// OD 12.12.2002 #103492#
class SwPagePreviewLayout;
struct SwAccessibilityOptions;
-
-//JP 19.07.98: - Bug 52312
-// define fuer Flags, die im CTOR oder den darunter liegenden Schichten
-// benoetigt werden.
-// Zur Zeit wird fuer die DrawPage das PreView Flag benoetigt
-#define VSHELLFLAG_ISPREVIEW ((long)0x1)
-
class ViewShell : public Ring
{
friend class SwViewImp;
@@ -139,19 +131,6 @@ public:
SwViewImp *Imp() { return pImp; }
const SwViewImp *Imp() const { return pImp; }
- //Klammerung von zusammengehoerenden Aktionen.
- sal_uInt16 ActionCount() const { return nStartAction; }
- sal_Bool ActionPend() const { return nStartAction != 0; }
- sal_Bool IsInEndAction() const { return bInEndAction; }
-
- void SetEndActionByVirDev( sal_Bool b ) { bEndActionByVirDev = b; }
- sal_Bool IsEndActionByVirDev() { return bEndActionByVirDev; }
-
- // Per UNO wird am RootFrame fuer alle shells der ActionCount kurzfristig
- // auf Null gesetzt und wieder restauriert
-
- inline sal_Bool HasInvalidRect() const { return aInvalidRect.HasArea(); }
-
void InvalidateWindows( const SwRect &rRect );
const SwRect &VisArea() const { return aVisArea; }
@@ -217,7 +196,6 @@ public:
//Damit in der UI nicht ueberall das dochxx includet werden muss
sal_Bool IsBrowseMode() const;
-
const Size& GetBrowseBorder() const{ return aBrowseBorder; }
virtual ~ViewShell();
More information about the Libreoffice-commits
mailing list