summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-10 09:29:34 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-10 11:21:03 +0000
commit2b12a5b87b1de9ae95d9562ba21201890b1100c5 (patch)
treeae0c1b5064c4d92e65db301e4d8acd87e891b159 /sw
parenta95b58060b01046a8881e97e0c5016e44200dd32 (diff)
the return of callcatcher
Change-Id: I447ebcc61ff061bce15678c6fcfd3d0a4669908f
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/docsh.hxx3
-rw-r--r--sw/source/core/access/accpara.cxx60
-rw-r--r--sw/source/core/access/accpara.hxx1
-rw-r--r--sw/source/core/text/inftxt.cxx51
-rw-r--r--sw/source/core/text/inftxt.hxx14
-rw-r--r--sw/source/ui/app/docsh.cxx18
6 files changed, 0 insertions, 147 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 20dfcea30f33..5f919cf83f3a 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -289,9 +289,6 @@ public:
virtual void setDocAccTitle( const OUString& rTitle );
virtual const OUString getDocAccTitle() const;
- void setDocReadOnly( bool bReadOnly);
- bool getDocReadOnly() const;
-
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
GetController();
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 6935f43f6911..561e396a1edd 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -781,44 +781,6 @@ sal_Bool SwAccessibleParagraph::GetWordBoundary(
// (DICTIONARY_WORD includes punctuation, ANY_WORD doesn't.)
const sal_uInt16 nWordType = i18n::WordType::ANY_WORD;
-/*
- // get word boundary, as the Break-Iterator sees fit.
- sal_Unicode SpaceChar(' ');
- if (rText.getCodePointAt(nPos) == SpaceChar)
- {
- int nStartPos = nPos;
- int nEndPos = nPos+1;
- while (nStartPos >= 0 && rText.getCodePointAt(nStartPos) == SpaceChar)
- --nStartPos;
- while (nEndPos < rText.getLength() && rText.getCodePointAt(nEndPos) == SpaceChar)
- ++nEndPos;
- //Get the previous word boundary + the followed space characters
- if (nStartPos >= 0)
- {
- rBound = pBreakIt->xBreak->getWordBoundary( rText, nStartPos, aLocale, nWordType, sal_True );
- rBound.endPos += (nEndPos-nStartPos - 1);
- }
- //When the frontal characters are whitespace, return the all space characters directly.
- else
- {
- rBound.startPos = 0;
- rBound.endPos = nEndPos;
- }
- }
- // add the " " into the word boundry
- else
- {
- rBound = pBreakIt->xBreak->getWordBoundary(rText, nPos, aLocale, nWordType, sal_True );
- sal_Int32 nEndPos = rBound.endPos, nLength = rText.getLength();
- while ( nEndPos < nLength && rText.getCodePointAt(nEndPos) == SpaceChar )
- nEndPos++;
- rBound.endPos = nEndPos;
- }
- tabCharInWord( nPos, rBound);
- if( GetPortionData().FillBoundaryIFDateField( rBound, rBound.startPos) )
- return sal_True;
- return sal_True; // MT: So why do we need the return TRUE above???
-*/
// get word boundary, as the Break-Iterator sees fit.
rBound = g_pBreakIt->GetBreakIter()->getWordBoundary(
rText, nPos, aLocale, nWordType, sal_True );
@@ -4146,26 +4108,4 @@ uno::Any SAL_CALL SwAccessibleParagraph::getExtendedAttributes()
return Ret;
}
-//Tab will be return when call WORDTYPE
-sal_Bool SwAccessibleParagraph::tabCharInWord( sal_Int32 nIndex, i18n::Boundary& aBound)
-{
- sal_Bool bFind = sal_False;
- if( aBound.startPos != nIndex)
- {
- OUString tabStr;
- if(aBound.startPos>nIndex)
- tabStr = GetString().copy(nIndex,(aBound.startPos - nIndex) );
-
- sal_Unicode tabChar('\t');
- sal_Int32 tabIndex = tabStr.indexOf(tabChar);
- if( tabIndex > -1 )
- {
- aBound.startPos = nIndex + tabIndex ;
- aBound.endPos = aBound.startPos + 1;
- bFind = sal_True;
- }
- }
- return bFind;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index a8bea061537a..1dbfa32afc62 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -439,7 +439,6 @@ public:
sal_Int32 GetRealHeadingLevel();
// XAccessibleComponent
sal_Bool m_bLastHasSelection;
- sal_Bool tabCharInWord(sal_Int32 nIndex, com::sun::star::i18n::Boundary& aBound);
// #i89175#
// XAccessibleMultiLineText
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index a65a1ebd46dc..0cc5cff8d551 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1796,56 +1796,6 @@ SwFontSave::~SwFontSave()
}
}
-SwDefFontSave::SwDefFontSave( const SwTxtSizeInfo &rInf )
- : pFnt( ((SwTxtSizeInfo&)rInf).GetFont() )
-{
- const bool bTmpAlter = pFnt->GetFixKerning() ||
- ( RTL_TEXTENCODING_SYMBOL == pFnt->GetCharSet(pFnt->GetActual()) )
- ;
-
- const bool bFamily = bTmpAlter &&
- pFnt->GetName( pFnt->GetActual() ) != numfunc::GetDefBulletFontname();
- const bool bRotation = pFnt->GetOrientation() &&
- ! rInf.GetTxtFrm()->IsVertical();
-
- if( bFamily || bRotation )
- {
- pNewFnt = new SwFont( *pFnt );
-
- if ( bFamily )
- {
- pNewFnt->SetFamily( FAMILY_DONTKNOW, pFnt->GetActual() );
- pNewFnt->SetName( numfunc::GetDefBulletFontname(), pFnt->GetActual() );
- pNewFnt->SetStyleName( aEmptyOUStr, pFnt->GetActual() );
- pNewFnt->SetCharSet( RTL_TEXTENCODING_SYMBOL, pFnt->GetActual() );
- pNewFnt->SetFixKerning( 0 );
- }
-
- if ( bRotation )
- pNewFnt->SetVertical( 0, rInf.GetTxtFrm()->IsVertical() );
-
- pInf = &((SwTxtSizeInfo&)rInf);
- pNewFnt->Invalidate();
- pInf->SetFont( pNewFnt );
- }
- else
- {
- pFnt = 0;
- pNewFnt = 0;
- }
-}
-
-SwDefFontSave::~SwDefFontSave()
-{
- if( pFnt )
- {
- delete pNewFnt;
- // Reset SwFont
- pFnt->Invalidate();
- pInf->SetFont( pFnt );
- }
-}
-
bool SwTxtFormatInfo::ChgHyph( const bool bNew )
{
const bool bOld = bAutoHyph;
@@ -1860,5 +1810,4 @@ bool SwTxtFormatInfo::ChgHyph( const bool bNew )
return bOld;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index dd77975eda07..145dde559a70 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -804,20 +804,6 @@ public:
};
/*************************************************************************
- * class SwDefFontSave
- *************************************************************************/
-
-class SwDefFontSave
-{
- SwTxtSizeInfo *pInf;
- SwFont *pFnt;
- SwFont *pNewFnt;
-public:
- SwDefFontSave( const SwTxtSizeInfo &rInf );
- ~SwDefFontSave();
-};
-
-/*************************************************************************
* Inline implementations of SwTxtSizeInfo
*************************************************************************/
inline KSHORT SwTxtSizeInfo::GetAscent() const
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 791287d1c9e0..1f60704b0054 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -1224,24 +1224,6 @@ const OUString SwDocShell::getDocAccTitle() const
return sRet;
}
-void SwDocShell::setDocReadOnly(bool bReadOnly)
-{
- if (pDoc)
- {
- pDoc->setDocReadOnly( bReadOnly );
- }
-}
-
-bool SwDocShell::getDocReadOnly() const
-{
- if (pDoc)
- {
- return pDoc->getDocReadOnly();
- }
-
- return false;
-}
-
static const char* s_EventNames[] =
{
"OnPageCountChange",